extend traces on subscribe

.circleci/config.yml

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

.eslintrc.js

@@ -1,4 +1,3 @@
-const LEGACY_FILES = ["platform/**", "example/**"];
 module.exports = {
     "env": {
         "browser": true,
@@ -11,8 +10,7 @@ module.exports = {
     },
     "extends": [
         "eslint:recommended",
-        "plugin:vue/recommended",
-        "plugin:you-dont-need-lodash-underscore/compatible"
+        "plugin:vue/recommended"
     ],
     "parser": "vue-eslint-parser",
     "parserOptions": {
@@ -24,9 +22,6 @@ module.exports = {
         }
     },
     "rules": {
-        "you-dont-need-lodash-underscore/omit": "off",
-        "you-dont-need-lodash-underscore/throttle": "off",
-        "you-dont-need-lodash-underscore/flatten": "off",
         "no-bitwise": "error",
         "curly": "error",
         "eqeqeq": "error",
@@ -71,56 +66,6 @@ module.exports = {
         ],
         "dot-notation": "error",
         "indent": ["error", 4],
-
-        // https://eslint.org/docs/rules/no-case-declarations
-        "no-case-declarations": "error",
-        // https://eslint.org/docs/rules/max-classes-per-file
-        "max-classes-per-file": ["error", 1],
-        // https://eslint.org/docs/rules/no-eq-null
-        "no-eq-null": "error",
-        // https://eslint.org/docs/rules/no-eval
-        "no-eval": "error",
-        // https://eslint.org/docs/rules/no-floating-decimal
-        "no-floating-decimal": "error",
-        // https://eslint.org/docs/rules/no-implicit-globals
-        "no-implicit-globals": "error",
-        // https://eslint.org/docs/rules/no-implied-eval
-        "no-implied-eval": "error",
-        // https://eslint.org/docs/rules/no-lone-blocks
-        "no-lone-blocks": "error",
-        // https://eslint.org/docs/rules/no-loop-func
-        "no-loop-func": "error",
-        // https://eslint.org/docs/rules/no-new-func
-        "no-new-func": "error",
-        // https://eslint.org/docs/rules/no-new-wrappers
-        "no-new-wrappers": "error",
-        // https://eslint.org/docs/rules/no-octal-escape
-        "no-octal-escape": "error",
-        // https://eslint.org/docs/rules/no-proto
-        "no-proto": "error",
-        // https://eslint.org/docs/rules/no-return-await
-        "no-return-await": "error",
-        // https://eslint.org/docs/rules/no-script-url
-        "no-script-url": "error",
-        // https://eslint.org/docs/rules/no-self-compare
-        "no-self-compare": "error",
-        // https://eslint.org/docs/rules/no-sequences
-        "no-sequences": "error",
-        // https://eslint.org/docs/rules/no-unmodified-loop-condition
-        "no-unmodified-loop-condition": "error",
-        // https://eslint.org/docs/rules/no-useless-call
-        "no-useless-call": "error",
-        // https://eslint.org/docs/rules/wrap-iife
-        "wrap-iife": "error",
-        // https://eslint.org/docs/rules/no-nested-ternary
-        "no-nested-ternary": "error",
-        // https://eslint.org/docs/rules/switch-colon-spacing
-        "switch-colon-spacing": "error",
-        // https://eslint.org/docs/rules/no-useless-computed-key
-        "no-useless-computed-key": "error",
-        // https://eslint.org/docs/rules/rest-spread-spacing
-        "rest-spread-spacing": ["error"],
-
         "vue/html-indent": [
             "error",
             4,
@@ -167,13 +112,6 @@ module.exports = {
                     }
                 ]
             }
-        }, {
-            "files": LEGACY_FILES,
-            "rules": {
-                // https://eslint.org/docs/rules/no-nested-ternary
-                "no-nested-ternary": "off",
-                "no-var": "off"
-            }
         }
     ]
 };

.gitignore

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

API.md

@@ -427,8 +427,8 @@ Each telemetry value description has an object defining hints.  Keys in this thi
 
 Known hints:
 
-* `domain`: Values with a `domain` hint will be used for the x-axis of a plot, and tables will render columns for these values first.
-* `range`: Values with a `range` hint will be used as the y-axis on a plot, and tables will render columns for these values after the `domain` values.
+* `domain`: Indicates that the value represents the "input" of a datum. Values with a `domain` hint will be used for the x-axis of a plot, and tables will render columns for these values first.
+* `range`: Indicates that the value is the "output" of a datum.  Values with a `range` hint will be used as the y-axis on a plot, and tables will render columns for these values after the `domain` values.
 * `image`: Indicates that the value may be interpreted as the URL to an image file, in which case appropriate views will be made available.
 
 ##### The Time Conductor and Telemetry 

CONTRIBUTING.md

@@ -103,7 +103,7 @@ the name chosen could not be mistaken for a topic or master branch.
 ### Merging
 
 When development is complete on an issue, the first step toward merging it
-back into the master branch is to file a Pull Request (PR). The contributions
+back into the master branch is to file a Pull Request. The contributions
 should meet code, test, and commit message standards as described below,
 and the pull request should include a completed author checklist, also
 as described below. Pull requests may be assigned to specific team
@@ -114,15 +114,6 @@ request. When the reviewer is satisfied, they should add a comment to
 the pull request containing the reviewer checklist (from below) and complete
 the merge back to the master branch.
 
-Additionally:
-* Every pull request must link to the issue that it addresses. Eg. “Addresses #1234” or “Closes #1234”. This is the responsibility of the pull request’s __author__. If no issue exists, create one.
-* Every __author__ must include testing instructions. These instructions should identify the areas of code affected, and some minimal test steps. If addressing a bug, reproduction steps should be included, if they were not included in the original issue. If reproduction steps were included on the original issue, and are sufficient, refer to them.
-* A pull request that closes an issue should say so in the description. Including the text “Closes #1234” will cause the linked issue to be automatically closed when the pull request is merged. This is the responsibility of the pull request’s __author__.
-* When a pull request is merged, and the corresponding issue closed, the __reviewer__ must add the tag “unverified” to the original issue. This will indicate that although the issue is closed, it has not been tested yet.
-* Every PR must have two reviewers assigned, though only one approval is necessary for merge.
-* Changes to API require approval by a senior developer.
-* When creating a PR, it is the author's responsibility to apply any priority label from the issue to the PR as well. This helps with prioritization.
-
 ## Standards
 
 Contributions to Open MCT are expected to meet the following standards.
@@ -131,104 +122,97 @@ changes.
 
 ### Code Standards
 
-JavaScript sources in Open MCT must satisfy the ESLint rules defined in 
-this repository. This is verified by the command line build.
+JavaScript sources in Open MCT must satisfy JSLint under its default
+settings. This is verified by the command line build.
 
 #### Code Guidelines
 
-The following guidelines are provided for anyone contributing source code to the Open MCT project:
+JavaScript sources in Open MCT should:
+
+* Use four spaces for indentation. Tabs should not be used.
+* Include JSDoc for any exposed API (e.g. public methods, constructors).
+* Include non-JSDoc comments as-needed for explaining private variables,
+  methods, or algorithms when they are non-obvious.
+* Define one public class per script, expressed as a constructor function
+  returned from an AMD-style module.
+* Follow “Java-like” naming conventions. These includes:
+  * Classes should use camel case, first letter capitalized
+    (e.g. SomeClassName).
+  * Methods, variables, fields, and function names should use camel case,
+    first letter lower-case (e.g. someVariableName).
+  * Constants (variables or fields which are meant to be declared and 
+    initialized statically, and never changed) should use only capital 
+    letters, with underscores between words (e.g. SOME_CONSTANT).
+  * File names should be the name of the exported class, plus a .js extension
+    (e.g. SomeClassName.js).
+* Avoid anonymous functions, except when functions are short (a few lines)
+  and/or their inclusion makes sense within the flow of the code
+  (e.g. as arguments to a forEach call).
+* Avoid deep nesting (especially of functions), except where necessary
+  (e.g. due to closure scope).
+* End with a single new-line character.
+* Expose public methods by declaring them on the class's prototype.
+* Within a given function's scope, do not mix declarations and imperative
+  code, and  present these in the following order:
+  * First, variable declarations and initialization.
+  * Second, function declarations.
+  * Third, imperative statements.
+  * Finally, the returned value.
 
-1. Write clean code. Here’s a good summary - https://github.com/ryanmcdermott/clean-code-javascript.
-1. Include JSDoc for any exposed API (e.g. public methods, classes).
-1. Include non-JSDoc comments as-needed for explaining private variables,
-   methods, or algorithms when they are non-obvious. Otherwise code 
-   should be self-documenting.
-1. Classes and Vue components should use camel case, first letter capitalized
-   (e.g. SomeClassName).
-1. Methods, variables, fields, events, and function names should use camelCase,
-   first letter lower-case (e.g. someVariableName).
-1. Source files that export functions should use camelCase, first letter lower-case (eg. testTools.js)
-1. Constants (variables or fields which are meant to be declared and 
-   initialized statically, and never changed) should use only capital 
-   letters, with underscores between words (e.g. SOME_CONSTANT). They should always be declared as `const`s
-1. File names should be the name of the exported class, plus a .js extension
-   (e.g. SomeClassName.js).
-1. Avoid anonymous functions, except when functions are short (one or two lines)
-   and their inclusion makes sense within the flow of the code
-   (e.g. as arguments to a forEach call). Anonymous functions should always be arrow functions.
-1. Named functions are preferred over functions assigned to variables.
-   eg.
-   ```JavaScript
-   function renameObject(object, newName) {
-       Object.name = newName;
-   }
-   ```
-   is preferable to
-   ```JavaScript
-   const rename = (object, newName) => {
-       Object.name = newName;
-   }
-   ```
-1. Avoid deep nesting (especially of functions), except where necessary
-   (e.g. due to closure scope).
-1. End with a single new-line character.
-1. Always use ES6 `Class`es and inheritence rather than the pre-ES6 prototypal 
-   pattern.
-1. Within a given function's scope, do not mix declarations and imperative
-   code, and  present these in the following order:
-   * First, variable declarations and initialization.
-   * Secondly, imperative statements.
-   * Finally, the returned value. A single return statement at the end of the function should be used, except where an early return would improve code clarity.
-1. Avoid the use of "magic" values.
-   eg.
-   ```JavaScript
-   Const UNAUTHORIZED = 401
-   if (responseCode === UNAUTHORIZED)
-   ```
-   is preferable to
-   ```JavaScript
-   if (responseCode === 401)
-   ```
-1. Use the ternary operator only for simple cases such as variable assignment. Nested ternaries should be avoided in all cases.
-1. Test specs should reside alongside the source code they test, not in a separate directory.
-1. Organize code by feature, not by type.
-   eg.
-   ```
-   - telemetryTable
-       - row
-           TableRow.js
-           TableRowCollection.js
-           TableRow.vue
-       - column
-           TableColumn.js
-           TableColumn.vue
-       plugin.js
-       pluginSpec.js
-   ```
-   is preferable to
-   ```
-   - telemetryTable
-       - components
-           TableRow.vue
-           TableColumn.vue
-       - collections
-           TableRowCollection.js
-       TableColumn.js
-       TableRow.js
-       plugin.js
-       pluginSpec.js
-   ```
 Deviations from Open MCT code style guidelines require two-party agreement,
 typically from the author of the change and its reviewer.
 
+#### Code Example
+
+```js
+/*global define*/
+
+/**
+ * Bundles should declare themselves as namespaces in whichever source
+ * file is most like the "main point of entry" to the bundle.
+ * @namespace some/bundle
+ */
+define(
+    ['./OtherClass'],
+    function (OtherClass) {
+        "use strict";
+
+        /**
+         * A summary of how to use this class goes here.
+         *
+         * @constructor
+         * @memberof some/bundle
+         */
+        function ExampleClass() {
+        }
+
+        // Methods which are not intended for external use should
+        // not have JSDoc (or should be marked @private)
+        ExampleClass.prototype.privateMethod = function () {
+        };
+
+        /**
+         * A summary of this method goes here.
+         * @param {number} n a parameter
+         * @returns {number} a return value
+         */
+        ExampleClass.prototype.publicMethod = function (n) {
+            return n * 2;
+        }
+
+        return ExampleClass;
+    }
+);
+```
+
 ### Test Standards
 
 Automated testing shall occur whenever changes are merged into the main
 development branch and must be confirmed alongside any pull request.
 
-Automated tests are tests which exercise plugins, API, and utility classes. 
-Tests are subject to code review along with the actual implementation, to 
-ensure that tests are applicable and useful.
+Automated tests are typically unit tests which exercise individual software
+components. Tests are subject to code review along with the actual
+implementation, to ensure that tests are applicable and useful.
 
 Examples of useful tests:
 * Tests which replicate bugs (or their root causes) to verify their
@@ -238,26 +222,8 @@ Examples of useful tests:
 * Tests which verify expected interactions with other components in the
   system.
 
-#### Guidelines
-* 100% statement coverage is achievable and desirable.
-* Do blackbox testing. Test external behaviors, not internal details. Write tests that describe what your plugin is supposed to do. How it does this doesn't matter, so don't test it.
-* Unit test specs for plugins should be defined at the plugin level. Start with one test spec per plugin named pluginSpec.js, and as this test spec grows too big, break it up into multiple test specs that logically group related tests.
-* Unit tests for API or for utility functions and classes may be defined at a per-source file level.
-* Wherever possible only use and mock public API, builtin functions, and UI in your test specs. Do not directly invoke any private functions. ie. only call or mock functions and objects exposed by openmct.* (eg. openmct.telemetry, openmct.objectView, etc.), and builtin browser functions (fetch, requestAnimationFrame, setTimeout, etc.).
-* Where builtin functions have been mocked, be sure to clear them between tests.
-* Test at an appropriate level of isolation. Eg. 
-    * If you’re testing a view, you do not need to test the whole application UI, you can just fetch the view provider using the public API and render the view into an element that you have created. 
-    * You do not need to test that the view switcher works, there should be separate tests for that. 
-    * You do not need to test that telemetry providers work, you can mock openmct.telemetry.request() to feed test data to the view.
-    * Use your best judgement when deciding on appropriate scope.
-* Automated tests for plugins should start by actually installing the plugin being tested, and then test that installing the plugin adds the desired features and behavior to Open MCT, observing the above rules.
-* All variables used in a test spec, including any instances of the Open MCT API should be declared inside of an appropriate block scope (not at the root level of the source file), and should be initialized in the relevant beforeEach block. `beforeEach` is preferable to `beforeAll` to avoid leaking of state between tests.
-* A `afterEach` or `afterAll` should be used to do any clean up necessary to prevent leakage of state between test specs. This can happen when functions on `window` are wrapped, or when the URL is changed. [A convenience function](https://github.com/nasa/openmct/blob/master/src/utils/testing.js#L59) is provided for resetting the URL and clearing builtin spies between tests.
-* If writing unit tests for legacy Angular code be sure to follow [best practices in order to avoid memory leaks](https://www.thecodecampus.de/blog/avoid-memory-leaks-angularjs-unit-tests/).
-
-#### Examples
-* [Example of an automated test spec for an object view plugin](https://github.com/nasa/openmct/blob/master/src/plugins/telemetryTable/pluginSpec.js)
-* [Example of an automated test spec for API](https://github.com/nasa/openmct/blob/master/src/api/time/TimeAPISpec.js)
+During automated testing, code coverage metrics will be reported. Line
+coverage must remain at or above 80%.
 
 ### Commit Message Standards
 
@@ -326,7 +292,6 @@ checklist).
 2. Unit tests included and/or updated with changes?
 3. Command line build passes?
 4. Changes have been smoke-tested?
-5. Testing instructions included?
 
 ### Reviewer Checklist
 
@@ -334,4 +299,3 @@ checklist).
 2. Appropriate unit tests included?
 3. Code style and in-line documentation are appropriate?
 4. Commit messages meet standards?
-5. Has associated issue been labelled `unverified`? (only applicable if this PR closes the issue)

LICENSE.md

@@ -1,6 +1,6 @@
 # Open MCT License
 
-Open MCT, Copyright (c) 2014-2020, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+Open MCT, Copyright (c) 2014-2019, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
 
 Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
 

docs/src/process/testing/plan.md

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

example/generator/GeneratorMetadataProvider.js

@@ -28,16 +28,6 @@ define([
                         domain: 2
                     }
                 },
-                // Need to enable "LocalTimeSystem" plugin to make use of this
-                // {
-                //     key: "local",
-                //     name: "Time",
-                //     format: "local-format",
-                //     source: "utc",
-                //     hints: {
-                //         domain: 3
-                //     }
-                // },
                 {
                     key: "sin",
                     name: "Sine",
@@ -60,8 +50,7 @@ define([
             values: [
                 {
                     key: "name",
-                    name: "Name",
-                    format: "string"
+                    name: "Name"
                 },
                 {
                     key: "utc",
@@ -71,15 +60,6 @@ define([
                         domain: 1
                     }
                 },
-                {
-                    key: "local",
-                    name: "Time",
-                    format: "utc",
-                    source: "utc",
-                    hints: {
-                        domain: 2
-                    }
-                },
                 {
                     key: "state",
                     source: "value",
@@ -119,7 +99,7 @@ define([
     };
 
     GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
-        return Object.assign(
+        return _.extend(
             {},
             domainObject.telemetry,
             METADATA_BY_TYPE[domainObject.type]

example/imagery/plugin.js

@@ -52,7 +52,6 @@ define([
             return {
                 name: name,
                 utc: Math.floor(timestamp / 5000) * 5000,
-                local: Math.floor(timestamp / 5000) * 5000,
                 url: IMAGE_SAMPLES[Math.floor(timestamp / 5000) % IMAGE_SAMPLES.length]
             };
         }
@@ -79,7 +78,7 @@ define([
             },
             request: function (domainObject, options) {
                 var start = options.start;
-                var end = Math.min(options.end, Date.now());
+                var end = options.end;
                 var data = [];
                 while (start <= end && data.length < 5000) {
                     data.push(pointForTimestamp(start, domainObject.name));
@@ -119,14 +118,6 @@ define([
                                 name: 'Time',
                                 key: 'utc',
                                 format: 'utc',
-                                hints: {
-                                    domain: 2
-                                }
-                            },
-                            {
-                                name: 'Local Time',
-                                key: 'local',
-                                format: 'local-format',
                                 hints: {
                                     domain: 1
                                 }

index.html

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

package.json

@@ -2,8 +2,11 @@
   "name": "openmct",
   "version": "1.0.0-snapshot",
   "description": "The Open MCT core platform",
+  "dependencies": {
+    "plotly.js-dist": "^1.54.1"
+  },
   "devDependencies": {
-    "angular": ">=1.8.0",
+    "angular": "1.7.9",
     "angular-route": "1.4.14",
     "babel-eslint": "8.2.6",
     "comma-separated-values": "^3.6.4",
@@ -23,7 +26,6 @@
     "d3-time-format": "2.1.x",
     "eslint": "5.2.0",
     "eslint-plugin-vue": "^6.0.0",
-    "eslint-plugin-you-dont-need-lodash-underscore": "^6.10.0",
     "eventemitter3": "^1.2.0",
     "exports-loader": "^0.7.0",
     "express": "^4.13.1",
@@ -38,29 +40,27 @@
     "istanbul-instrumenter-loader": "^3.0.1",
     "jasmine-core": "^3.1.0",
     "jsdoc": "^3.3.2",
-    "karma": "5.0.9",
-    "karma-chrome-launcher": "3.1.0",
+    "karma": "^2.0.3",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.2",
     "karma-coverage-istanbul-reporter": "^2.1.1",
     "karma-html-reporter": "^0.2.7",
-    "karma-jasmine": "^2.0.0",
+    "karma-jasmine": "^1.1.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^3.0.0",
     "location-bar": "^3.0.1",
-    "lodash": "^4.17.12",
+    "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
     "mini-css-extract-plugin": "^0.4.1",
     "minimist": "^1.1.1",
-    "moment": "2.25.3",
+    "moment": "^2.25.3",
     "moment-duration-format": "^2.2.2",
-    "moment-timezone": "0.5.28",
+    "moment-timezone": "^0.5.21",
     "node-bourbon": "^4.2.3",
     "node-sass": "^4.9.2",
     "painterro": "^0.2.65",
-    "plotly.js-basic-dist-min": "^1.54.6",
-    "plotly.js-gl2d-dist-min": "^1.54.5",
     "printj": "^1.2.1",
     "raw-loader": "^0.5.1",
     "request": "^2.69.0",
@@ -85,10 +85,10 @@
     "build:prod": "cross-env NODE_ENV=production webpack",
     "build:dev": "webpack",
     "build:watch": "webpack --watch",
-    "test": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run",
+    "test": "karma start --single-run",
     "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:watch": "cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --no-single-run",
+    "test:coverage": "./scripts/test-coverage.sh",
+    "test:watch": "karma start --no-single-run",
     "verify": "concurrently 'npm:test' 'npm:lint'",
     "jsdoc": "jsdoc -c jsdoc.json -R API.md -r -d dist/docs/api",
     "otherdoc": "node docs/gendocs.js --in docs/src --out dist/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",

platform/commonUI/dialog/res/templates/overlay-message-list.html

@@ -6,12 +6,6 @@
                     ng-show="ngModel.dialog.messages.length > 1 ||
                             ngModel.dialog.messages.length == 0">s</span>
             </div>
-            <button
-                ng-if="ngModel.dialog.topBarButton"
-                class="c-button c-button--major"
-                ng-click="ngModel.topBarButton.onClick">
-                {{ ngModel.topBarButton.label }}
-            </button>
         </div>
         <div class="w-messages c-overlay__messages">
             <mct-include
@@ -22,7 +16,7 @@
             <button ng-repeat="dialogAction in ngModel.dialog.actions"
                class="c-button c-button--major"
                ng-click="dialogAction.action()">
-                {{ dialogAction.label }}
+                {{dialogAction.label}}
             </button>
         </div>
     </div>

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

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

platform/commonUI/edit/src/policies/EditPersistableObjectsPolicy.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define(
-    ['objectUtils'],
+    ['../../../../../src/api/objects/object-utils'],
     function (objectUtils) {
 
         /**

platform/commonUI/notification/bundle.js

@@ -21,15 +21,44 @@
  *****************************************************************************/
 
 define([
-    "./src/NotificationService"
+    "./src/NotificationIndicatorController",
+    "./src/NotificationIndicator",
+    "./src/NotificationService",
+    "./res/notification-indicator.html"
 ], function (
-    NotificationService
+    NotificationIndicatorController,
+    NotificationIndicator,
+    NotificationService,
+    notificationIndicatorTemplate
 ) {
 
     return {
         name:"platform/commonUI/notification",
         definition: {
             "extensions": {
+                "templates": [
+                    {
+                        "key": "notificationIndicatorTemplate",
+                        "template": notificationIndicatorTemplate
+                    }
+                ],
+                "controllers": [
+                    {
+                        "key": "NotificationIndicatorController",
+                        "implementation": NotificationIndicatorController,
+                        "depends": [
+                            "$scope",
+                            "openmct",
+                            "dialogService"
+                        ]
+                    }
+                ],
+                "indicators": [
+                    {
+                        "implementation": NotificationIndicator,
+                        "priority": "fallback"
+                    }
+                ],
                 "services": [
                     {
                         "key": "notificationService",

platform/commonUI/notification/res/notification-indicator.html

@@ -0,0 +1,8 @@
+<!-- DO NOT ADD SPACES BETWEEN THE SPANS - IT ADDS WHITE SPACE!! -->
+<div ng-show="notifications.length > 0" class="c-indicator c-indicator--clickable s-status-{{highest.severity}} icon-bell"
+      ng-controller="NotificationIndicatorController">
+    <span class="label c-indicator__label">
+        <button ng-click="showNotificationsList()">
+           {{notifications.length}} Notification<span ng-show="notifications.length > 1">s</span></button>
+    </span><span class="c-indicator__count">{{notifications.length}}</span>
+</div>

platform/commonUI/notification/src/NotificationIndicator.js

@@ -19,10 +19,15 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import NewFolderAction from './newFolderAction';
 
-export default function () {
-    return function (openmct) {
-        openmct.contextMenu.registerAction(new NewFolderAction(openmct));
-    };
-}
+define(
+    [],
+    function () {
+
+        function NotificationIndicator() {}
+
+        NotificationIndicator.template = 'notificationIndicatorTemplate';
+
+        return NotificationIndicator;
+    }
+);

platform/commonUI/notification/src/NotificationIndicatorController.js

@@ -0,0 +1,73 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Provides an indicator that is visible when there are
+         * banner notifications that have been minimized. Will also indicate
+         * the number of notifications. Notifications can be viewed by
+         * clicking on the indicator to launch a dialog showing a list of
+         * notifications.
+         * @param $scope
+         * @param notificationService
+         * @param dialogService
+         * @constructor
+         */
+        function NotificationIndicatorController($scope, openmct, dialogService) {
+            $scope.notifications = openmct.notifications.notifications;
+            $scope.highest = openmct.notifications.highest;
+
+            /**
+             * Launch a dialog showing a list of current notifications.
+             */
+            $scope.showNotificationsList = function () {
+                let notificationsList = openmct.notifications.notifications.map(notification => {
+                    if (notification.model.severity === 'alert' || notification.model.severity === 'info') {
+                        notification.model.primaryOption = {
+                            label: 'Dismiss',
+                            callback: () => {
+                                let currentIndex = notificationsList.indexOf(notification);
+                                notification.dismiss();
+                                notificationsList.splice(currentIndex, 1);
+                            }
+                        }
+                    }
+                    return notification;
+                })
+                dialogService.getDialogResponse('overlay-message-list', {
+                    dialog: {
+                        title: "Messages",
+                        //Launch the message list dialog with the models
+                        // from the notifications
+                        messages: notificationsList
+                    }
+                });
+
+            };
+        }
+        return NotificationIndicatorController;
+    }
+);
+

platform/commonUI/notification/test/NotificationIndicatorControllerSpec.js

@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define(
+    ['../src/NotificationIndicatorController'],
+    function (NotificationIndicatorController) {
+
+        xdescribe("The notification indicator controller ", function () {
+            var mockNotificationService,
+                mockScope,
+                mockDialogService,
+                controller;
+
+            beforeEach(function () {
+                mockNotificationService = jasmine.createSpy("notificationService");
+                mockScope = jasmine.createSpy("$scope");
+                mockDialogService = jasmine.createSpyObj(
+                    "dialogService",
+                    ["getDialogResponse","dismiss"]
+                );
+                mockNotificationService.highest = {
+                    severity: "error"
+                };
+                controller = new NotificationIndicatorController(mockScope, mockNotificationService, mockDialogService);
+            });
+
+            it("exposes the highest notification severity to the template", function () {
+                expect(mockScope.highest).toBeTruthy();
+                expect(mockScope.highest.severity).toBe("error");
+            });
+
+            it("invokes the dialog service to show list of messages", function () {
+                expect(mockScope.showNotificationsList).toBeDefined();
+                mockScope.showNotificationsList();
+                expect(mockDialogService.getDialogResponse).toHaveBeenCalled();
+                expect(mockDialogService.getDialogResponse.calls.mostRecent().args[0]).toBe('overlay-message-list');
+                expect(mockDialogService.getDialogResponse.calls.mostRecent().args[1].dialog).toBeDefined();
+            });
+        });
+    }
+);

platform/containment/src/PersistableCompositionPolicy.js

@@ -26,7 +26,7 @@
  * @namespace platform/containment
  */
 define(
-    ['objectUtils'],
+    ['../../../src/api/objects/object-utils'],
     function (objectUtils) {
 
         function PersistableCompositionPolicy(openmct) {

platform/core/src/actions/ActionCapability.js

@@ -81,7 +81,7 @@ define(
                 baseContext = context || {};
             }
 
-            var actionContext = Object.assign({}, baseContext);
+            var actionContext = _.extend({}, baseContext);
             actionContext.domainObject = this.domainObject;
 
             return this.actionService.getActions(actionContext);

platform/entanglement/src/actions/MoveAction.js

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

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

@@ -121,7 +121,7 @@ define(['lodash'], function (_) {
      */
     ExportAsJSONAction.prototype.rewriteLink = function (child, parent) {
         this.externalIdentifiers.push(this.getId(child));
-        var index = parent.composition.findIndex(id => {
+        var index = _.findIndex(parent.composition, function (id) {
             return _.isEqual(child.identifier, id);
         });
         var copyOfChild = this.copyObject(child);

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

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-define(['zepto', 'objectUtils'], function ($, objectUtils) {
+define(['zepto', '../../../../src/api/objects/object-utils.js'], function ($, objectUtils) {
 
     /**
      * The ImportAsJSONAction is available from context menus and allows a user
@@ -216,14 +216,8 @@ define(['zepto', 'objectUtils'], function ($, objectUtils) {
     };
 
     ImportAsJSONAction.appliesTo = function (context) {
-        let domainObject = context.domainObject;
-
-        if (domainObject && domainObject.model.locked) {
-            return false;
-        }
-
-        return domainObject !== undefined &&
-            domainObject.hasCapability("composition");
+        return context.domainObject !== undefined &&
+            context.domainObject.hasCapability("composition");
     };
 
     return ImportAsJSONAction;

platform/search/src/services/GenericSearchProvider.js

@@ -25,7 +25,7 @@
  * Module defining GenericSearchProvider. Created by shale on 07/16/2015.
  */
 define([
-    'objectUtils',
+    '../../../../src/api/objects/object-utils',
     'lodash'
 ], function (
     objectUtils,
@@ -191,7 +191,7 @@ define([
         }
 
         var domainObject = objectUtils.toNewFormat(model, id);
-        var composition = this.openmct.composition.registry.find(p => {
+        var composition = _.find(this.openmct.composition.registry, function (p) {
             return p.appliesTo(domainObject);
         });
 

platform/telemetry/src/TelemetryCapability.js

@@ -25,7 +25,7 @@
  */
 define(
     [
-        'objectUtils',
+        '../../../src/api/objects/object-utils',
         'lodash'
     ],
     function (
@@ -235,7 +235,7 @@ define(
             var defaultRange = metadata.valuesForHints(['range'])[0];
             defaultRange = defaultRange ? defaultRange.key : undefined;
 
-            var sourceMap = _.keyBy(metadata.values(), 'key');
+            var sourceMap = _.indexBy(metadata.values(), 'key');
 
             var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject) ===
                 telemetryAPI.legacyProvider;
@@ -300,7 +300,7 @@ define(
             var defaultRange = metadata.valuesForHints(['range'])[0];
             defaultRange = defaultRange ? defaultRange.key : undefined;
 
-            var sourceMap = _.keyBy(metadata.values(), 'key');
+            var sourceMap = _.indexBy(metadata.values(), 'key');
 
             var isLegacyProvider = telemetryAPI.findSubscriptionProvider(domainObject) ===
                 telemetryAPI.legacyProvider;

scripts/test-coverage.sh

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

src/MCT.js

@@ -28,7 +28,7 @@ define([
     './api/api',
     './api/overlays/OverlayAPI',
     './selection/Selection',
-    'objectUtils',
+    './api/objects/object-utils',
     './plugins/plugins',
     './adapter/indicators/legacy-indicators-plugin',
     './plugins/buildInfo/plugin',
@@ -249,7 +249,7 @@ define([
         this.legacyRegistry = new BundleRegistry();
         installDefaultBundles(this.legacyRegistry);
 
-        // Plugins that are installed by default
+        // Plugin's that are installed by default
 
         this.install(this.plugins.Plot());
         this.install(this.plugins.PlotlyPlot());
@@ -267,9 +267,6 @@ define([
         this.install(this.plugins.WebPage());
         this.install(this.plugins.Condition());
         this.install(this.plugins.ConditionWidget());
-        this.install(this.plugins.URLTimeSettingsSynchronizer());
-        this.install(this.plugins.NotificationIndicator());
-        this.install(this.plugins.NewFolderAction());
     }
 
     MCT.prototype = Object.create(EventEmitter.prototype);
@@ -354,13 +351,17 @@ define([
      * @param {HTMLElement} [domElement] the DOM element in which to run
      *        MCT; if undefined, MCT will be run in the body of the document
      */
-    MCT.prototype.start = function (domElement = document.body, isHeadlessMode = false) {
+    MCT.prototype.start = function (domElement) {
         if (!this.plugins.DisplayLayout._installed) {
             this.install(this.plugins.DisplayLayout({
                 showAsView: ['summary-widget']
             }));
         }
 
+        if (!domElement) {
+            domElement = document.body;
+        }
+
         this.element = domElement;
 
         this.legacyExtension('runs', {
@@ -400,31 +401,24 @@ define([
                 // something has depended upon objectService.  Cool, right?
                 this.$injector.get('objectService');
 
-                if (!isHeadlessMode) {
-                    var appLayout = new Vue({
-                        components: {
-                            'Layout': Layout.default
-                        },
-                        provide: {
-                            openmct: this
-                        },
-                        template: '<Layout ref="layout"></Layout>'
-                    });
-                    domElement.appendChild(appLayout.$mount().$el);
+                var appLayout = new Vue({
+                    components: {
+                        'Layout': Layout.default
+                    },
+                    provide: {
+                        openmct: this
+                    },
+                    template: '<Layout ref="layout"></Layout>'
+                });
+                domElement.appendChild(appLayout.$mount().$el);
 
-                    this.layout = appLayout.$refs.layout;
-                    Browse(this);
-                }
+                this.layout = appLayout.$refs.layout;
+                Browse(this);
                 this.router.start();
                 this.emit('start');
             }.bind(this));
     };
 
-    MCT.prototype.startHeadless = function () {
-        let unreachableNode = document.createElement('div');
-        return this.start(unreachableNode, true);
-    }
-
     /**
      * Install a plugin in MCT.
      *
@@ -436,10 +430,6 @@ define([
         plugin(this);
     };
 
-    MCT.prototype.destroy = function () {
-        this.emit('destroy');
-    };
-
     MCT.prototype.plugins = plugins;
 
     return MCT;

src/MCTSpec.js

@@ -21,28 +21,24 @@
  *****************************************************************************/
 
 define([
+    './MCT',
     './plugins/plugins',
-    'legacyRegistry',
-    'utils/testing'
-], function (plugins, legacyRegistry, testUtils) {
-    describe("MCT", function () {
+    'legacyRegistry'
+], function (MCT, plugins, legacyRegistry) {
+    xdescribe("MCT", function () {
         var openmct;
         var mockPlugin;
         var mockPlugin2;
         var mockListener;
         var oldBundles;
 
-        beforeAll(() => {
-            testUtils.resetApplicationState();
-        });
-
         beforeEach(function () {
             mockPlugin = jasmine.createSpy('plugin');
             mockPlugin2 = jasmine.createSpy('plugin2');
             mockListener = jasmine.createSpy('listener');
             oldBundles = legacyRegistry.list();
 
-            openmct = testUtils.createOpenMct();
+            openmct = new MCT();
 
             openmct.install(mockPlugin);
             openmct.install(mockPlugin2);
@@ -56,7 +52,6 @@ define([
                     legacyRegistry.delete(bundle);
                 }
             });
-            testUtils.resetApplicationState(openmct);
         });
 
         it("exposes plugins", function () {
@@ -68,11 +63,8 @@ define([
         });
 
         describe("start", function () {
-            let appHolder;
-            beforeEach(function (done) {
-                appHolder = document.createElement("div");
-                openmct.on('start', done);
-                openmct.start(appHolder);
+            beforeEach(function () {
+                openmct.start();
             });
 
             it("calls plugins for configuration", function () {
@@ -83,51 +75,25 @@ define([
             it("emits a start event", function () {
                 expect(mockListener).toHaveBeenCalled();
             });
-
-            it("Renders the application into the provided container element", function () {
-                let openMctShellElements = appHolder.querySelectorAll('div.l-shell');
-                expect(openMctShellElements.length).toBe(1);
-            });
-        });
-
-        describe("startHeadless", function () {
-            beforeEach(function (done) {
-                openmct.on('start', done);
-                openmct.startHeadless();
-            });
-
-            it("calls plugins for configuration", function () {
-                expect(mockPlugin).toHaveBeenCalledWith(openmct);
-                expect(mockPlugin2).toHaveBeenCalledWith(openmct);
-            });
-
-            it("emits a start event", function () {
-                expect(mockListener).toHaveBeenCalled();
-            });
-
-            it("Does not render Open MCT", function () {
-                let openMctShellElements = document.body.querySelectorAll('div.l-shell');
-                expect(openMctShellElements.length).toBe(0);
-            });
         });
 
         describe("setAssetPath", function () {
             var testAssetPath;
 
             beforeEach(function () {
-                openmct.legacyExtension = jasmine.createSpy('legacyExtension');
-            });
-
-            it("configures the path for assets", function () {
-                testAssetPath = "some/path/";
-                openmct.setAssetPath(testAssetPath);
-                expect(openmct.getAssetPath()).toBe(testAssetPath);
-            });
-
-            it("adds a trailing /", function () {
                 testAssetPath = "some/path";
+                openmct.legacyExtension = jasmine.createSpy('legacyExtension');
                 openmct.setAssetPath(testAssetPath);
-                expect(openmct.getAssetPath()).toBe(testAssetPath + "/");
+            });
+
+            it("internally configures the path for assets", function () {
+                expect(openmct.legacyExtension).toHaveBeenCalledWith(
+                    'constants',
+                    {
+                        key: "ASSETS_PATH",
+                        value: testAssetPath
+                    }
+                );
             });
         });
     });

src/adapter/actions/ActionDialogDecorator.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'objectUtils'
+    '../../api/objects/object-utils'
 ], function (objectUtils) {
     function ActionDialogDecorator(mct, actionService) {
         this.mct = mct;

src/adapter/bundle.js

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

src/adapter/capabilities/AdapterCapability.js

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define(['objectUtils'], function (objectUtils) {
+define(['../../api/objects/object-utils'], function (objectUtils) {
     function AdapterCapability(domainObject) {
         this.domainObject = domainObject;
     }

src/adapter/capabilities/AlternateCompositionCapability.js

@@ -24,7 +24,7 @@
  * Module defining AlternateCompositionCapability. Created by vwoeltje on 11/7/14.
  */
 define([
-    'objectUtils',
+    '../../api/objects/object-utils',
     '../../../platform/core/src/capabilities/ContextualDomainObject'
 ], function (objectUtils, ContextualDomainObject) {
     function AlternateCompositionCapability($injector, domainObject) {

src/adapter/capabilities/patchViewCapability.js

@@ -31,7 +31,6 @@ define([
             var capability = viewConstructor(domainObject);
             var oldInvoke = capability.invoke.bind(capability);
 
-            /* eslint-disable you-dont-need-lodash-underscore/map */
             capability.invoke = function () {
                 var availableViews = oldInvoke();
                 var newDomainObject = capability
@@ -53,8 +52,6 @@ define([
                     .map('view')
                     .value();
             };
-            /* eslint-enable you-dont-need-lodash-underscore/map */
-
             return capability;
         };
     }

src/adapter/runs/AlternateCompositionInitializer.js

@@ -22,7 +22,7 @@
 
 define([
     '../capabilities/AlternateCompositionCapability',
-    'objectUtils'
+    '../../api/objects/object-utils'
 ], function (
     AlternateCompositionCapability,
     objectUtils

src/adapter/runs/LegacyTelemetryProvider.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'objectUtils'
+    '../../api/objects/object-utils'
 ], function (
     utils
 ) {

src/adapter/runs/TimeSettingsURLHandler.js

@@ -0,0 +1,150 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    'lodash'
+], function (
+    _
+) {
+    // Parameter names in query string
+    var SEARCH = {
+        MODE: 'tc.mode',
+        TIME_SYSTEM: 'tc.timeSystem',
+        START_BOUND: 'tc.startBound',
+        END_BOUND: 'tc.endBound',
+        START_DELTA: 'tc.startDelta',
+        END_DELTA: 'tc.endDelta'
+    };
+    var TIME_EVENTS = ['bounds', 'timeSystem', 'clock', 'clockOffsets'];
+    // Used to shorthand calls to $location, which clears null parameters
+    var NULL_PARAMETERS = { key: null, start: null, end: null };
+
+    /**
+     * Communicates settings from the URL to the time API,
+     * and vice versa.
+     */
+    function TimeSettingsURLHandler(time, $location, $rootScope) {
+        this.time = time;
+        this.$location = $location;
+
+        $rootScope.$on('$locationChangeSuccess', this.updateTime.bind(this));
+
+        TIME_EVENTS.forEach(function (event) {
+            this.time.on(event, this.updateQueryParams.bind(this));
+        }, this);
+
+        this.updateTime(); // Initialize
+    }
+
+    TimeSettingsURLHandler.prototype.updateQueryParams = function () {
+        var clock = this.time.clock();
+        var fixed = !clock;
+        var mode = fixed ? 'fixed' : clock.key;
+        var timeSystem = this.time.timeSystem() || NULL_PARAMETERS;
+        var bounds = fixed ? this.time.bounds() : NULL_PARAMETERS;
+        var deltas = fixed ? NULL_PARAMETERS : this.time.clockOffsets();
+
+        bounds = bounds || NULL_PARAMETERS;
+        deltas = deltas || NULL_PARAMETERS;
+        if (deltas.start) {
+            deltas = { start: -deltas.start, end: deltas.end };
+        }
+
+        this.$location.search(SEARCH.MODE, mode);
+        this.$location.search(SEARCH.TIME_SYSTEM, timeSystem.key);
+        this.$location.search(SEARCH.START_BOUND, bounds.start);
+        this.$location.search(SEARCH.END_BOUND, bounds.end);
+        this.$location.search(SEARCH.START_DELTA, deltas.start);
+        this.$location.search(SEARCH.END_DELTA, deltas.end);
+    };
+
+    TimeSettingsURLHandler.prototype.parseQueryParams = function () {
+        var searchParams = _.pick(this.$location.search(), _.values(SEARCH));
+        var parsedParams = {
+            clock: searchParams[SEARCH.MODE],
+            timeSystem: searchParams[SEARCH.TIME_SYSTEM]
+        };
+        if (!isNaN(parseInt(searchParams[SEARCH.START_DELTA], 0xA)) &&
+            !isNaN(parseInt(searchParams[SEARCH.END_DELTA], 0xA))) {
+            parsedParams.clockOffsets = {
+                start: -searchParams[SEARCH.START_DELTA],
+                end: +searchParams[SEARCH.END_DELTA]
+            };
+        }
+        if (!isNaN(parseInt(searchParams[SEARCH.START_BOUND], 0xA)) &&
+            !isNaN(parseInt(searchParams[SEARCH.END_BOUND], 0xA))) {
+            parsedParams.bounds = {
+                start: +searchParams[SEARCH.START_BOUND],
+                end: +searchParams[SEARCH.END_BOUND]
+            };
+        }
+        return parsedParams;
+    };
+
+    TimeSettingsURLHandler.prototype.updateTime = function () {
+        var params = this.parseQueryParams();
+        if (_.isEqual(params, this.last)) {
+            return; // Do nothing;
+        }
+        this.last = params;
+
+        if (!params.timeSystem) {
+            this.updateQueryParams();
+        } else if (params.clock === 'fixed' && params.bounds) {
+            if (!this.time.timeSystem() ||
+                this.time.timeSystem().key !== params.timeSystem) {
+
+                this.time.timeSystem(
+                    params.timeSystem,
+                    params.bounds
+                );
+            } else if (!_.isEqual(this.time.bounds(), params.bounds)) {
+                this.time.bounds(params.bounds);
+            }
+            if (this.time.clock()) {
+                this.time.stopClock();
+            }
+        } else if (params.clockOffsets) {
+            if (params.clock === 'fixed') {
+                this.time.stopClock();
+                return;
+            }
+            if (!this.time.clock() ||
+                this.time.clock().key !== params.clock) {
+
+                this.time.clock(params.clock, params.clockOffsets);
+            } else if (!_.isEqual(this.time.clockOffsets(), params.clockOffsets)) {
+                this.time.clockOffsets(params.clockOffsets);
+            }
+            if (!this.time.timeSystem() ||
+                this.time.timeSystem().key !== params.timeSystem) {
+
+                this.time.timeSystem(params.timeSystem);
+            }
+        } else {
+            // Neither found, update from timeSystem.
+            this.updateQueryParams();
+        }
+    };
+
+    return TimeSettingsURLHandler;
+});

src/adapter/runs/TimeSettingsURLHandlerSpec.js

@@ -0,0 +1,576 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+define([
+    './TimeSettingsURLHandler',
+    '../../api/time/TimeAPI'
+], function (
+    TimeSettingsURLHandler,
+    TimeAPI
+) {
+    describe("TimeSettingsURLHandler", function () {
+        var time;
+        var $location;
+        var $rootScope;
+        var search;
+        var handler; // eslint-disable-line
+        var clockA;
+        var clockB;
+        var timeSystemA;
+        var timeSystemB;
+        var boundsA;
+        var boundsB;
+        var offsetsA;
+        var offsetsB;
+        var initialize;
+        var triggerLocationChange;
+
+
+        beforeEach(function () {
+            clockA = jasmine.createSpyObj('clockA', ['on', 'off']);
+            clockA.key = 'clockA';
+            clockA.currentValue = function () {
+                return 1000;
+            };
+            clockB = jasmine.createSpyObj('clockB', ['on', 'off']);
+            clockB.key = 'clockB';
+            clockB.currentValue = function () {
+                return 2000;
+            };
+            timeSystemA = {key: 'timeSystemA'};
+            timeSystemB = {key: 'timeSystemB'};
+            boundsA = {
+                start: 10,
+                end: 20
+            };
+            boundsB = {
+                start: 120,
+                end: 360
+            };
+            offsetsA = {
+                start: -100,
+                end: 0
+            };
+            offsetsB = {
+                start: -50,
+                end: 50
+            };
+
+            time = new TimeAPI();
+
+            [
+                'on',
+                'bounds',
+                'clockOffsets',
+                'timeSystem',
+                'clock',
+                'stopClock'
+            ].forEach(function (method) {
+                spyOn(time, method).and.callThrough();
+            });
+            time.addTimeSystem(timeSystemA);
+            time.addTimeSystem(timeSystemB);
+            time.addClock(clockA);
+            time.addClock(clockB);
+
+            $location = jasmine.createSpyObj('$location', [
+                'search'
+            ]);
+            $rootScope = jasmine.createSpyObj('$rootScope', [
+                '$on'
+            ]);
+
+            search = {};
+            $location.search.and.callFake(function (key, value) {
+                if (arguments.length === 0) {
+                    return search;
+                }
+                if (value === null) {
+                    delete search[key];
+                } else {
+                    search[key] = String(value);
+                }
+                return this;
+            });
+
+            expect(time.timeSystem()).toBeUndefined();
+            expect(time.bounds()).toEqual({});
+            expect(time.clockOffsets()).toBeUndefined();
+            expect(time.clock()).toBeUndefined();
+
+            initialize = function () {
+                handler = new TimeSettingsURLHandler(
+                    time,
+                    $location,
+                    $rootScope
+                );
+                expect($rootScope.$on).toHaveBeenCalledWith(
+                    '$locationChangeSuccess',
+                    jasmine.any(Function)
+                );
+                triggerLocationChange = $rootScope.$on.calls.mostRecent().args[1];
+
+            };
+        });
+
+        it("initializes with missing time system", function () {
+            // This handles an odd transitory case where a url does not include
+            // a timeSystem.  It's generally only experienced by those who
+            // based their code on the tutorial before it specified a time
+            // system.
+            search['tc.mode'] = 'clockA';
+            search['tc.timeSystem'] = undefined;
+            search['tc.startDelta'] = '123';
+            search['tc.endDelta'] = '456';
+
+            // We don't specify behavior right now other than "don't break."
+            expect(initialize).not.toThrow();
+        });
+
+        it("can initalize fixed mode from location", function () {
+            search['tc.mode'] = 'fixed';
+            search['tc.timeSystem'] = 'timeSystemA';
+            search['tc.startBound'] = '123';
+            search['tc.endBound'] = '456';
+
+            initialize();
+
+            expect(time.timeSystem).toHaveBeenCalledWith(
+                'timeSystemA',
+                {
+                    start: 123,
+                    end: 456
+                }
+            );
+        });
+
+        it("can initialize clock mode from location", function () {
+            search['tc.mode'] = 'clockA';
+            search['tc.timeSystem'] = 'timeSystemA';
+            search['tc.startDelta'] = '123';
+            search['tc.endDelta'] = '456';
+
+            initialize();
+
+            expect(time.clock).toHaveBeenCalledWith(
+                'clockA',
+                {
+                    start: -123,
+                    end: 456
+                }
+            );
+            expect(time.timeSystem).toHaveBeenCalledWith(
+                'timeSystemA'
+            );
+        });
+
+        it("can initialize fixed mode from time API", function () {
+            time.timeSystem(timeSystemA.key, boundsA);
+            initialize();
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.mode', 'fixed');
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.timeSystem', 'timeSystemA');
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.startBound', 10);
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.endBound', 20);
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.startDelta', null);
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.endDelta', null);
+        });
+
+        it("can initialize clock mode from time API", function () {
+            time.clock(clockA.key, offsetsA);
+            time.timeSystem(timeSystemA.key);
+            initialize();
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.mode', 'clockA');
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.timeSystem', 'timeSystemA');
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.startBound', null);
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.endBound', null);
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.startDelta', 100);
+            expect($location.search)
+                .toHaveBeenCalledWith('tc.endDelta', 0);
+        });
+
+        describe('location changes in fixed mode', function () {
+
+            beforeEach(function () {
+                time.timeSystem(timeSystemA.key, boundsA);
+                initialize();
+                time.timeSystem.calls.reset();
+                time.bounds.calls.reset();
+                time.clock.calls.reset();
+                time.stopClock.calls.reset();
+            });
+
+            it("does not change on spurious location change", function () {
+                triggerLocationChange();
+                expect(time.timeSystem).not.toHaveBeenCalledWith(
+                    'timeSystemA',
+                    jasmine.any(Object)
+                );
+                expect(time.bounds).not.toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
+                expect(time.stopClock).not.toHaveBeenCalled();
+            });
+
+            it("updates timeSystem changes", function () {
+                search['tc.timeSystem'] = 'timeSystemB';
+                triggerLocationChange();
+                expect(time.timeSystem).toHaveBeenCalledWith(
+                    'timeSystemB',
+                    {
+                        start: 10,
+                        end: 20
+                    }
+                );
+            });
+
+            it("updates bounds changes", function () {
+                search['tc.startBound'] = '100';
+                search['tc.endBound'] = '200';
+                triggerLocationChange();
+                expect(time.timeSystem).not.toHaveBeenCalledWith(
+                    jasmine.anything(), jasmine.anything()
+                );
+                expect(time.bounds).toHaveBeenCalledWith({
+                    start: 100,
+                    end: 200
+                });
+                search['tc.endBound'] = '300';
+                triggerLocationChange();
+                expect(time.timeSystem).not.toHaveBeenCalledWith(
+                    jasmine.anything(), jasmine.anything()
+                );
+                expect(time.bounds).toHaveBeenCalledWith({
+                    start: 100,
+                    end: 300
+                });
+            });
+
+            it("updates clock mode w/o timeSystem change", function () {
+                search['tc.mode'] = 'clockA';
+                search['tc.startDelta'] = '50';
+                search['tc.endDelta'] = '50';
+                delete search['tc.endBound'];
+                delete search['tc.startBound'];
+                triggerLocationChange();
+                expect(time.clock).toHaveBeenCalledWith(
+                    'clockA',
+                    {
+                        start: -50,
+                        end: 50
+                    }
+                );
+                expect(time.timeSystem).not.toHaveBeenCalledWith(
+                    jasmine.anything(), jasmine.anything()
+                );
+            });
+
+            it("updates clock mode and timeSystem", function () {
+                search['tc.mode'] = 'clockA';
+                search['tc.startDelta'] = '50';
+                search['tc.endDelta'] = '50';
+                search['tc.timeSystem'] = 'timeSystemB';
+                delete search['tc.endBound'];
+                delete search['tc.startBound'];
+                triggerLocationChange();
+                expect(time.clock).toHaveBeenCalledWith(
+                    'clockA',
+                    {
+                        start: -50,
+                        end: 50
+                    }
+                );
+                expect(time.timeSystem).toHaveBeenCalledWith('timeSystemB');
+            });
+        });
+
+        describe('location changes in clock mode', function () {
+
+            beforeEach(function () {
+                time.clock(clockA.key, offsetsA);
+                time.timeSystem(timeSystemA.key);
+                initialize();
+                time.timeSystem.calls.reset();
+                time.bounds.calls.reset();
+                time.clock.calls.reset();
+                time.clockOffsets.calls.reset();
+                time.stopClock.calls.reset();
+            });
+
+            it("does not change on spurious location change", function () {
+                triggerLocationChange();
+                expect(time.timeSystem).not.toHaveBeenCalledWith(
+                    'timeSystemA',
+                    jasmine.any(Object)
+                );
+                expect(time.clockOffsets).not.toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
+                expect(time.clock).not.toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
+                expect(time.bounds).not.toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
+            });
+
+            it("changes time system", function () {
+                search['tc.timeSystem'] = 'timeSystemB';
+                triggerLocationChange();
+                expect(time.timeSystem).toHaveBeenCalledWith(
+                    'timeSystemB'
+                );
+                expect(time.clockOffsets).not.toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
+                expect(time.clock).not.toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
+                expect(time.stopClock).not.toHaveBeenCalled();
+                expect(time.bounds).not.toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
+            });
+
+            it("changes offsets", function () {
+                search['tc.startDelta'] = '50';
+                search['tc.endDelta'] = '50';
+                triggerLocationChange();
+                expect(time.timeSystem).not.toHaveBeenCalledWith(
+                    'timeSystemA',
+                    jasmine.any(Object)
+                );
+                expect(time.clockOffsets).toHaveBeenCalledWith(
+                    {
+                        start: -50,
+                        end: 50
+                    }
+                );
+                expect(time.clock).not.toHaveBeenCalledWith(
+                    jasmine.any(Object)
+                );
+            });
+
+            it("updates to fixed w/o timeSystem change", function () {
+                search['tc.mode'] = 'fixed';
+                search['tc.startBound'] = '234';
+                search['tc.endBound'] = '567';
+                delete search['tc.endDelta'];
+                delete search['tc.startDelta'];
+
+                triggerLocationChange();
+                expect(time.stopClock).toHaveBeenCalled();
+                expect(time.bounds).toHaveBeenCalledWith({
+                    start: 234,
+                    end: 567
+                });
+                expect(time.timeSystem).not.toHaveBeenCalledWith(
+                    jasmine.anything(), jasmine.anything()
+                );
+            });
+
+            it("updates fixed and timeSystem", function () {
+                search['tc.mode'] = 'fixed';
+                search['tc.startBound'] = '234';
+                search['tc.endBound'] = '567';
+                search['tc.timeSystem'] = 'timeSystemB';
+                delete search['tc.endDelta'];
+                delete search['tc.startDelta'];
+
+                triggerLocationChange();
+                expect(time.stopClock).toHaveBeenCalled();
+                expect(time.timeSystem).toHaveBeenCalledWith(
+                    'timeSystemB',
+                    {
+                        start: 234,
+                        end: 567
+                    }
+                );
+            });
+
+            it("updates clock", function () {
+                search['tc.mode'] = 'clockB';
+                triggerLocationChange();
+                expect(time.clock).toHaveBeenCalledWith(
+                    'clockB',
+                    {
+                        start: -100,
+                        end: 0
+                    }
+                );
+                expect(time.timeSystem).not.toHaveBeenCalledWith(jasmine.anything());
+            });
+
+            it("updates clock and timeSystem", function () {
+                search['tc.mode'] = 'clockB';
+                search['tc.timeSystem'] = 'timeSystemB';
+                triggerLocationChange();
+                expect(time.clock).toHaveBeenCalledWith(
+                    'clockB',
+                    {
+                        start: -100,
+                        end: 0
+                    }
+                );
+                expect(time.timeSystem).toHaveBeenCalledWith(
+                    'timeSystemB'
+                );
+            });
+
+            it("updates clock and timeSystem and offsets", function () {
+                search['tc.mode'] = 'clockB';
+                search['tc.timeSystem'] = 'timeSystemB';
+                search['tc.startDelta'] = '50';
+                search['tc.endDelta'] = '50';
+                triggerLocationChange();
+                expect(time.clock).toHaveBeenCalledWith(
+                    'clockB',
+                    {
+                        start: -50,
+                        end: 50
+                    }
+                );
+                expect(time.timeSystem).toHaveBeenCalledWith(
+                    'timeSystemB'
+                );
+            });
+
+            it("stops the clock", function () {
+                // this is a robustness test, unsure if desired, requires
+                // user to be manually editing location strings.
+                search['tc.mode'] = 'fixed';
+                triggerLocationChange();
+                expect(time.stopClock).toHaveBeenCalled();
+            });
+        });
+
+
+        describe("location updates from time API in fixed", function () {
+            beforeEach(function () {
+                time.timeSystem(timeSystemA.key, boundsA);
+                initialize();
+            });
+
+            it("updates on bounds change", function () {
+                time.bounds(boundsB);
+                expect(search).toEqual({
+                    'tc.mode': 'fixed',
+                    'tc.startBound': '120',
+                    'tc.endBound': '360',
+                    'tc.timeSystem': 'timeSystemA'
+                });
+            });
+
+            it("updates on timeSystem change", function () {
+                time.timeSystem(timeSystemB, boundsA);
+                expect(search).toEqual({
+                    'tc.mode': 'fixed',
+                    'tc.startBound': '10',
+                    'tc.endBound': '20',
+                    'tc.timeSystem': 'timeSystemB'
+                });
+                time.timeSystem(timeSystemA, boundsB);
+                expect(search).toEqual({
+                    'tc.mode': 'fixed',
+                    'tc.startBound': '120',
+                    'tc.endBound': '360',
+                    'tc.timeSystem': 'timeSystemA'
+                });
+            });
+
+            it("Updates to clock", function () {
+                time.clock(clockA, offsetsA);
+                expect(search).toEqual({
+                    'tc.mode': 'clockA',
+                    'tc.startDelta': '100',
+                    'tc.endDelta': '0',
+                    'tc.timeSystem': 'timeSystemA'
+                });
+            });
+        });
+
+        describe("location updates from time API in fixed", function () {
+            beforeEach(function () {
+                time.clock(clockA.key, offsetsA);
+                time.timeSystem(timeSystemA.key);
+                initialize();
+            });
+
+            it("updates offsets", function () {
+                time.clockOffsets(offsetsB);
+                expect(search).toEqual({
+                    'tc.mode': 'clockA',
+                    'tc.startDelta': '50',
+                    'tc.endDelta': '50',
+                    'tc.timeSystem': 'timeSystemA'
+                });
+            });
+
+            it("updates clocks", function () {
+                time.clock(clockB, offsetsA);
+                expect(search).toEqual({
+                    'tc.mode': 'clockB',
+                    'tc.startDelta': '100',
+                    'tc.endDelta': '0',
+                    'tc.timeSystem': 'timeSystemA'
+                });
+                time.clock(clockA, offsetsB);
+                expect(search).toEqual({
+                    'tc.mode': 'clockA',
+                    'tc.startDelta': '50',
+                    'tc.endDelta': '50',
+                    'tc.timeSystem': 'timeSystemA'
+                });
+            });
+
+            it("updates timesystems", function () {
+                time.timeSystem(timeSystemB);
+                expect(search).toEqual({
+                    'tc.mode': 'clockA',
+                    'tc.startDelta': '100',
+                    'tc.endDelta': '0',
+                    'tc.timeSystem': 'timeSystemB'
+                });
+            });
+
+            it("stops the clock", function () {
+                time.stopClock();
+                expect(search).toEqual({
+                    'tc.mode': 'fixed',
+                    'tc.startBound': '900',
+                    'tc.endBound': '1000',
+                    'tc.timeSystem': 'timeSystemA'
+                });
+            });
+        });
+    });
+});

src/adapter/services/LegacyObjectAPIInterceptor.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'objectUtils'
+    '../../api/objects/object-utils'
 ], function (
     utils
 ) {

src/adapter/services/MissingModelCompatibilityDecorator.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'objectUtils'
+    '../../api/objects/object-utils'
 ], function (
     objectUtils
 ) {

src/adapter/views/installLegacyViews.js

@@ -1,7 +1,7 @@
 define([
     './LegacyViewProvider',
     './TypeInspectorViewProvider',
-    'objectUtils'
+    '../../api/objects/object-utils'
 ], function (
     LegacyViewProvider,
     TypeInspectorViewProvider,

src/api/composition/CompositionAPI.js

@@ -70,7 +70,7 @@ define([
      * @memberof module:openmct.CompositionAPI#
      */
     CompositionAPI.prototype.get = function (domainObject) {
-        var provider = this.registry.find(p => {
+        var provider = _.find(this.registry, function (p) {
             return p.appliesTo(domainObject);
         });
 

src/api/composition/CompositionCollection.js

@@ -122,7 +122,7 @@ define([
             throw new Error('Event not supported by composition: ' + event);
         }
 
-        var index = this.listeners[event].findIndex(l => {
+        var index = _.findIndex(this.listeners[event], function (l) {
             return l.callback === callback && l.context === context;
         });
 

src/api/composition/DefaultCompositionProvider.js

@@ -22,7 +22,7 @@
 
 define([
     'lodash',
-    'objectUtils'
+    '../objects/object-utils'
 ], function (
     _,
     objectUtils
@@ -143,7 +143,7 @@ define([
         var keyString = objectUtils.makeKeyString(domainObject.identifier);
         var objectListeners = this.listeningTo[keyString];
 
-        var index = objectListeners[event].findIndex(l => {
+        var index = _.findIndex(objectListeners[event], function (l) {
             return l.callback === callback && l.context === context;
         });
 
@@ -196,8 +196,8 @@ define([
      * @private
      */
     DefaultCompositionProvider.prototype.includes = function (parent, childId) {
-        return parent.composition.some(composee =>
-            this.publicAPI.objects.areIdsEqual(composee, childId));
+        return parent.composition.findIndex(composee =>
+            this.publicAPI.objects.areIdsEqual(composee, childId)) !== -1;
     };
 
     DefaultCompositionProvider.prototype.reorder = function (domainObject, oldIndex, newIndex) {

src/api/notifications/NotificationAPI.js

@@ -128,11 +128,6 @@ export default class NotificationAPI extends EventEmitter {
         return this._notify(notificationModel);
     }
 
-    dismissAllNotifications() {
-        this.notifications = [];
-        this.emit('dismiss-all');
-    }
-
     /**
      * Minimize a notification. The notification will still be available
      * from the notification list. Typically notifications with a

src/api/objects/MutableObject.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define([
-    'objectUtils',
+    './object-utils.js',
     'lodash'
 ], function (
     utils,

src/api/objects/ObjectAPI.js

@@ -22,7 +22,7 @@
 
 define([
     'lodash',
-    'objectUtils',
+    './object-utils',
     './MutableObject',
     './RootRegistry',
     './RootObjectProvider',

src/api/objects/RootRegistry.js

@@ -43,7 +43,7 @@ define([
     }
 
     RootRegistry.prototype.addRoot = function (key) {
-        if (isKey(key) || (Array.isArray(key) && key.every(isKey))) {
+        if (isKey(key) || (_.isArray(key) && _.every(key, isKey))) {
             this.providers.push(function () {
                 return key;
             });

src/api/objects/test/object-utilsSpec.js

@@ -1,5 +1,5 @@
 define([
-    'objectUtils'
+    '../object-utils'
 ], function (
     objectUtils
 ) {

src/api/telemetry/DefaultMetadataProvider.js

@@ -85,9 +85,9 @@ define([
                             value: +e.value
                         };
                     }), 'e.value');
-                valueMetadata.values = valueMetadata.enumerations.map(e => e.value);
-                valueMetadata.max = Math.max(valueMetadata.values);
-                valueMetadata.min = Math.min(valueMetadata.values);
+                valueMetadata.values = _.pluck(valueMetadata.enumerations, 'value');
+                valueMetadata.max = _.max(valueMetadata.values);
+                valueMetadata.min = _.min(valueMetadata.values);
             }
 
             valueMetadatas.push(valueMetadata);
@@ -103,7 +103,7 @@ define([
         var metadata = domainObject.telemetry || {};
         if (this.typeHasTelemetry(domainObject)) {
             var typeMetadata = this.typeService.getType(domainObject.type).typeDef.telemetry;
-            Object.assign(metadata, typeMetadata);
+            _.extend(metadata, typeMetadata);
             if (!metadata.values) {
                 metadata.values = valueMetadatasFromOldFormat(metadata);
             }

src/api/telemetry/TelemetryAPI.js

@@ -24,7 +24,7 @@ define([
     './TelemetryMetadataManager',
     './TelemetryValueFormatter',
     './DefaultMetadataProvider',
-    'objectUtils',
+    '../objects/object-utils',
     'lodash'
 ], function (
     TelemetryMetadataManager,
@@ -370,7 +370,7 @@ define([
     TelemetryAPI.prototype.commonValuesForHints = function (metadatas, hints) {
         var options = metadatas.map(function (metadata) {
             var values = metadata.valuesForHints(hints);
-            return _.keyBy(values, 'key');
+            return _.indexBy(values, 'key');
         }).reduce(function (a, b) {
             var results = {};
             Object.keys(a).forEach(function (key) {
@@ -383,7 +383,7 @@ define([
         var sortKeys = hints.map(function (h) {
             return 'hints.' + h;
         });
-        return _.sortBy(options, sortKeys);
+        return _.sortByAll(options, sortKeys);
     };
 
     /**

src/api/telemetry/TelemetryMetadataManager.js

@@ -57,13 +57,13 @@ define([
 
         if (valueMetadata.format === 'enum') {
             if (!valueMetadata.values) {
-                valueMetadata.values = valueMetadata.enumerations.map(e => e.value);
+                valueMetadata.values = _.pluck(valueMetadata.enumerations, 'value');
             }
             if (!valueMetadata.hasOwnProperty('max')) {
-                valueMetadata.max = Math.max(valueMetadata.values) + 1;
+                valueMetadata.max = _.max(valueMetadata.values) + 1;
             }
             if (!valueMetadata.hasOwnProperty('min')) {
-                valueMetadata.min = Math.min(valueMetadata.values) - 1;
+                valueMetadata.min = _.min(valueMetadata.values) - 1;
             }
         }
 
@@ -121,7 +121,7 @@ define([
                 return metadata.hints[hint];
             }
         });
-        return _.sortBy(matchingMetadata, ...iteratees);
+        return _.sortByAll(matchingMetadata, ...iteratees);
     };
 
     TelemetryMetadataManager.prototype.getFilterableValues = function () {

src/plugins/LADTable/LADTableCompositionPolicy.js

@@ -1,32 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-export default function ladTableCompositionPolicy(openmct) {
-    return function (parent, child) {
-        if(parent.type === 'LadTable') {
-            return openmct.telemetry.isTelemetryObject(child);
-        } else if(parent.type === 'LadTableSet') {
-            return child.type === 'LadTable';
-        }
-        return true;
-    }
-}

src/plugins/LADTable/LADTableSetViewProvider.js

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

src/plugins/LADTable/LADTableViewProvider.js

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

src/plugins/LADTable/components/LADRow.vue

@@ -1,6 +1,6 @@
 
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
+ * Open MCT, Copyright (c) 2014-2018, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -22,16 +22,12 @@
  *****************************************************************************/
 
 <template>
-<tr
-    class="js-lad-table__body__row"
-    @contextmenu.prevent="showContextMenu"
->
-    <td class="js-first-data">{{ name }}</td>
-    <td class="js-second-data">{{ formattedTimestamp }}</td>
-    <td
-        class="js-third-data"
-        :class="valueClass"
-    >{{ value }}</td>
+<tr @contextmenu.prevent="showContextMenu">
+    <td>{{ name }}</td>
+    <td>{{ timestamp }}</td>
+    <td :class="valueClass">
+        {{ value }}
+    </td>
 </tr>
 </template>
 
@@ -56,22 +52,16 @@ export default {
 
         return {
             name: this.domainObject.name,
-            timestamp: undefined,
+            timestamp: '---',
             value: '---',
             valueClass: '',
             currentObjectPath
         }
     },
-    computed: {
-        formattedTimestamp() {
-            return this.timestamp !== undefined ? this.getFormattedTimestamp(this.timestamp) : '---';
-        }
-    },
     mounted() {
         this.metadata = this.openmct.telemetry.getMetadata(this.domainObject);
         this.formats = this.openmct.telemetry.getFormatMap(this.metadata);
         this.keyString = this.openmct.objects.makeKeyString(this.domainObject.identifier);
-        this.bounds = this.openmct.time.bounds();
 
         this.limitEvaluator = this.openmct
             .telemetry
@@ -86,7 +76,6 @@ export default {
             );
 
         this.openmct.time.on('timeSystem', this.updateTimeSystem);
-        this.openmct.time.on('bounds', this.updateBounds);
 
         this.timestampKey = this.openmct.time.timeSystem().key;
 
@@ -100,91 +89,46 @@ export default {
             .telemetry
             .subscribe(this.domainObject, this.updateValues);
 
-        this.requestHistory();
+        this.openmct
+            .telemetry
+            .request(this.domainObject, {strategy: 'latest'})
+            .then((array) => this.updateValues(array[array.length - 1]));
     },
     destroyed() {
         this.stopWatchingMutation();
         this.unsubscribe();
-        this.openmct.time.off('timeSystem', this.updateTimeSystem);
-        this.openmct.time.off('bounds', this.updateBounds);
+        this.openmct.off('timeSystem', this.updateTimeSystem);
     },
     methods: {
         updateValues(datum) {
-            let newTimestamp = this.getParsedTimestamp(datum),
-                limit;
+            this.timestamp = this.formats[this.timestampKey].format(datum);
+            this.value = this.formats[this.valueKey].format(datum);
 
-            if(this.shouldUpdate(newTimestamp)) {
-                this.timestamp = newTimestamp;
-                this.value = this.formats[this.valueKey].format(datum);
-                limit = this.limitEvaluator.evaluate(datum, this.valueMetadata);
-                if (limit) {
-                    this.valueClass = limit.cssClass;
-                } else {
-                    this.valueClass = '';
-                }
+            var limit = this.limitEvaluator.evaluate(datum, this.valueMetadata);
+
+            if (limit) {
+                this.valueClass = limit.cssClass;
+            } else {
+                this.valueClass = '';
             }
         },
-        shouldUpdate(newTimestamp) {
-            let newTimestampInBounds = this.inBounds(newTimestamp),
-                noExistingTimestamp = this.timestamp === undefined,
-                newTimestampIsLatest = newTimestamp > this.timestamp;
-
-            return newTimestampInBounds &&
-                (noExistingTimestamp || newTimestampIsLatest);
-        },
-        requestHistory() {
-            this.openmct
-                .telemetry
-                .request(this.domainObject, {
-                    start: this.bounds.start,
-                    end: this.bounds.end,
-                    size: 1,
-                    strategy: 'latest'
-                })
-                .then((array) => this.updateValues(array[array.length - 1]));
-        },
         updateName(name) {
             this.name = name;
         },
-        updateBounds(bounds, isTick) {
-            this.bounds = bounds;
-            if(!isTick) {
-                this.resetValues();
-                this.requestHistory();
-            }
-        },
-        inBounds(timestamp) {
-            return timestamp >= this.bounds.start && timestamp <= this.bounds.end;
-        },
         updateTimeSystem(timeSystem) {
-            this.resetValues();
+            this.value = '---';
+            this.timestamp = '---';
+            this.valueClass = '';
             this.timestampKey = timeSystem.key;
+
+            this.openmct
+                .telemetry
+                .request(this.domainObject, {strategy: 'latest'})
+                .then((array) => this.updateValues(array[array.length - 1]));
+
         },
         showContextMenu(event) {
             this.openmct.contextMenu._showContextMenuForObjectPath(this.currentObjectPath, event.x, event.y, CONTEXT_MENU_ACTIONS);
-        },
-        resetValues() {
-            this.value = '---';
-            this.timestamp = undefined;
-            this.valueClass = '';
-        },
-        getParsedTimestamp(timestamp) {
-            if(this.timeSystemFormat()) {
-                return this.formats[this.timestampKey].parse(timestamp);
-            }
-        },
-        getFormattedTimestamp(timestamp) {
-            if(this.timeSystemFormat()) {
-                return this.formats[this.timestampKey].format(timestamp);
-            }
-        },
-        timeSystemFormat() {
-            if(this.formats[this.timestampKey]) {
-                return true;
-            } else {
-                console.warn(`No formatter for ${this.timestampKey} time system for ${this.domainObject.name}.`);
-                return false;
-            }
         }
     }
 }

src/plugins/LADTable/components/LADTable.vue

@@ -75,7 +75,7 @@ export default {
             this.items.push(item);
         },
         removeItem(identifier) {
-            let index = this.items.findIndex(item => this.openmct.objects.makeKeyString(identifier) === item.key);
+            let index = _.findIndex(this.items, (item) => this.openmct.objects.makeKeyString(identifier) === item.key);
 
             this.items.splice(index, 1);
         },
@@ -88,3 +88,4 @@ export default {
     }
 }
 </script>
+

src/plugins/LADTable/components/LadTableSet.vue

@@ -35,7 +35,7 @@
         >
             <tr
                 :key="primary.key"
-                class="c-table__group-header js-lad-table-set__table-headers"
+                class="c-table__group-header"
             >
                 <td colspan="10">
                     {{ primary.domainObject.name }}
@@ -102,7 +102,7 @@ export default {
             this.compositions.push({composition, addCallback, removeCallback});
         },
         removePrimary(identifier) {
-            let index = this.primaryTelemetryObjects.findIndex(primary => this.openmct.objects.makeKeyString(identifier) === primary.key),
+            let index = _.findIndex(this.primaryTelemetryObjects, (primary) => this.openmct.objects.makeKeyString(identifier) === primary.key),
                 primary = this.primaryTelemetryObjects[index];
 
             this.$set(this.secondaryTelemetryObjects, primary.key, undefined);
@@ -130,7 +130,7 @@ export default {
         removeSecondary(primary) {
             return (identifier) => {
                 let array = this.secondaryTelemetryObjects[primary.key],
-                    index = array.findIndex(secondary => this.openmct.objects.makeKeyString(identifier) === secondary.key);
+                    index = _.findIndex(array, (secondary) => this.openmct.objects.makeKeyString(identifier) === secondary.key);
 
                 array.splice(index, 1);
 

src/plugins/LADTable/plugin.js

@@ -19,36 +19,38 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import LADTableViewProvider from './LADTableViewProvider';
-import LADTableSetViewProvider from './LADTableSetViewProvider';
-import ladTableCompositionPolicy from './LADTableCompositionPolicy';
 
-export default function plugin() {
-    return function install(openmct) {
+define([
+    './LADTableViewProvider',
+    './LADTableSetViewProvider'
+], function (
+    LADTableViewProvider,
+    LADTableSetViewProvider
+) {
+    return function plugin() {
+        return function install(openmct) {
+            openmct.objectViews.addProvider(new LADTableViewProvider(openmct));
+            openmct.objectViews.addProvider(new LADTableSetViewProvider(openmct));
 
-        openmct.objectViews.addProvider(new LADTableViewProvider(openmct));
-        openmct.objectViews.addProvider(new LADTableSetViewProvider(openmct));
+            openmct.types.addType('LadTable', {
+                name: "LAD Table",
+                creatable: true,
+                description: "A Latest Available Data tabular view in which each row displays the values for one or more contained telemetry objects.",
+                cssClass: 'icon-tabular-lad',
+                initialize(domainObject) {
+                    domainObject.composition = [];
+                }
+            });
 
-        openmct.types.addType('LadTable', {
-            name: "LAD Table",
-            creatable: true,
-            description: "A Latest Available Data tabular view in which each row displays the values for one or more contained telemetry objects.",
-            cssClass: 'icon-tabular-lad',
-            initialize(domainObject) {
-                domainObject.composition = [];
-            }
-        });
-
-        openmct.types.addType('LadTableSet', {
-            name: "LAD Table Set",
-            creatable: true,
-            description: "A Latest Available Data tabular view in which each row displays the values for one or more contained telemetry objects.",
-            cssClass: 'icon-tabular-lad-set',
-            initialize(domainObject) {
-                domainObject.composition = [];
-            }
-        });
-
-        openmct.composition.addPolicy(ladTableCompositionPolicy(openmct));
+            openmct.types.addType('LadTableSet', {
+                name: "LAD Table Set",
+                creatable: true,
+                description: "A Latest Available Data tabular view in which each row displays the values for one or more contained telemetry objects.",
+                cssClass: 'icon-tabular-lad-set',
+                initialize(domainObject) {
+                    domainObject.composition = [];
+                }
+            });
+        };
     };
-}
+});

src/plugins/LADTable/pluginSpec.js

@@ -1,365 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import LadPlugin from './plugin.js';
-import Vue from 'vue';
-import {
-    createOpenMct,
-    getMockObjects,
-    getMockTelemetry,
-    getLatestTelemetry,
-    resetApplicationState
-} from 'utils/testing';
-
-const TABLE_BODY_ROWS = '.js-lad-table__body__row';
-const TABLE_BODY_FIRST_ROW = TABLE_BODY_ROWS + ':first-child';
-const TABLE_BODY_FIRST_ROW_FIRST_DATA = TABLE_BODY_FIRST_ROW + ' .js-first-data';
-const TABLE_BODY_FIRST_ROW_SECOND_DATA = TABLE_BODY_FIRST_ROW + ' .js-second-data';
-const TABLE_BODY_FIRST_ROW_THIRD_DATA = TABLE_BODY_FIRST_ROW + ' .js-third-data';
-const LAD_SET_TABLE_HEADERS = '.js-lad-table-set__table-headers';
-
-function utcTimeFormat(value) {
-    return new Date(value).toISOString().replace('T', ' ')
-}
-
-describe("The LAD Table", () => {
-    const ladTableKey = 'LadTable';
-
-    let openmct,
-        ladPlugin,
-        parent,
-        child,
-        telemetryCount = 3,
-        timeFormat = 'utc',
-        mockTelemetry = getMockTelemetry({ count: telemetryCount, format: timeFormat }),
-        mockObj = getMockObjects({
-            objectKeyStrings: ['ladTable', 'telemetry'],
-            format: timeFormat
-        }),
-        bounds = {
-            start: 0,
-            end: 4
-        };
-
-    // add telemetry object as composition in lad table
-    mockObj.ladTable.composition.push(mockObj.telemetry.identifier);
-
-    // this setups up the app
-    beforeEach((done) => {
-        const appHolder = document.createElement('div');
-        appHolder.style.width = '640px';
-        appHolder.style.height = '480px';
-
-        openmct = createOpenMct();
-
-        parent = document.createElement('div');
-        child = document.createElement('div');
-        parent.appendChild(child);
-
-        spyOn(openmct.telemetry, 'request').and.returnValue(Promise.resolve([]));
-
-        ladPlugin = new LadPlugin();
-        openmct.install(ladPlugin);
-
-        spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
-
-        openmct.time.bounds({ start: bounds.start, end: bounds.end });
-
-        openmct.on('start', done);
-        openmct.startHeadless(appHolder);
-    });
-
-    afterEach(() => {
-        resetApplicationState(openmct);
-    });
-
-    it("should provide a table view only for lad table objects", () => {
-        let applicableViews = openmct.objectViews.get(mockObj.ladTable),
-            ladTableView = applicableViews.find(
-                (viewProvider) => viewProvider.key === ladTableKey
-            );
-
-        expect(applicableViews.length).toEqual(1);
-        expect(ladTableView).toBeDefined();
-    });
-
-    describe('composition', () => {
-        let ladTableCompositionCollection;
-
-        beforeEach(() => {
-            ladTableCompositionCollection = openmct.composition.get(mockObj.ladTable);
-            ladTableCompositionCollection.load();
-        });
-
-        it("should accept telemetry producing objects", () => {
-            expect(() => {
-                ladTableCompositionCollection.add(mockObj.telemetry);
-            }).not.toThrow();
-        });
-
-        it("should reject non-telemtry producing objects", () => {
-            expect(()=> {
-                ladTableCompositionCollection.add(mockObj.ladTable);
-            }).toThrow();
-        });
-    });
-
-    describe("table view", () => {
-        let applicableViews,
-            ladTableViewProvider,
-            ladTableView,
-            anotherTelemetryObj = getMockObjects({
-                objectKeyStrings: ['telemetry'],
-                overwrite: {
-                    telemetry: {
-                        name: "New Telemetry Object",
-                        identifier: { namespace: "", key: "another-telemetry-object" }
-                    }
-                }
-            }).telemetry;
-
-        // add another telemetry object as composition in lad table to test multi rows
-        mockObj.ladTable.composition.push(anotherTelemetryObj.identifier);
-
-        beforeEach(async () => {
-            let telemetryRequestResolve,
-                telemetryObjectResolve,
-                anotherTelemetryObjectResolve;
-            let telemetryRequestPromise = new Promise((resolve) => {
-                    telemetryRequestResolve = resolve;
-                }),
-                telemetryObjectPromise = new Promise((resolve) => {
-                    telemetryObjectResolve = resolve;
-                }),
-                anotherTelemetryObjectPromise = new Promise((resolve) => {
-                    anotherTelemetryObjectResolve = resolve;
-                })
-            openmct.telemetry.request.and.callFake(() => {
-                telemetryRequestResolve(mockTelemetry);
-                return telemetryRequestPromise;
-            });
-            openmct.objects.get.and.callFake((obj) => {
-                if(obj.key === 'telemetry-object') {
-                    telemetryObjectResolve(mockObj.telemetry);
-                    return telemetryObjectPromise;
-                } else {
-                    anotherTelemetryObjectResolve(anotherTelemetryObj);
-                    return anotherTelemetryObjectPromise;
-                }
-            });
-
-            openmct.time.bounds({ start: bounds.start, end: bounds.end });
-
-            applicableViews = openmct.objectViews.get(mockObj.ladTable);
-            ladTableViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableKey);
-            ladTableView = ladTableViewProvider.view(mockObj.ladTable, [mockObj.ladTable]);
-            ladTableView.show(child, true);
-
-            await Promise.all([telemetryRequestPromise, telemetryObjectPromise, anotherTelemetryObjectPromise]);
-            await Vue.nextTick();
-            return;
-        });
-
-        it("should show one row per object in the composition", () => {
-            const rowCount = parent.querySelectorAll(TABLE_BODY_ROWS).length;
-            expect(rowCount).toBe(mockObj.ladTable.composition.length);
-        });
-
-        it("should show the most recent datum from the telemetry producing object", async () => {
-            const latestDatum = getLatestTelemetry(mockTelemetry, { timeFormat });
-            const expectedDate = utcTimeFormat(latestDatum[timeFormat]);
-            await Vue.nextTick();
-            const latestDate = parent.querySelector(TABLE_BODY_FIRST_ROW_SECOND_DATA).innerText;
-            expect(latestDate).toBe(expectedDate);
-        });
-
-        it("should show the name provided for the the telemetry producing object", () => {
-            const rowName = parent.querySelector(TABLE_BODY_FIRST_ROW_FIRST_DATA).innerText,
-                expectedName = mockObj.telemetry.name;
-            expect(rowName).toBe(expectedName);
-        });
-
-        it("should show the correct values for the datum based on domain and range hints", async () => {
-            const range = mockObj.telemetry.telemetry.values.find((val) => {
-                return val.hints && val.hints.range !== undefined;
-            }).key;
-            const domain = mockObj.telemetry.telemetry.values.find((val) => {
-                return val.hints && val.hints.domain !== undefined;
-            }).key;
-            const mostRecentTelemetry = getLatestTelemetry(mockTelemetry, { timeFormat });
-            const rangeValue = mostRecentTelemetry[range];
-            const domainValue = utcTimeFormat(mostRecentTelemetry[domain]);
-            await Vue.nextTick();
-            const actualDomainValue = parent.querySelector(TABLE_BODY_FIRST_ROW_SECOND_DATA).innerText;
-            const actualRangeValue = parent.querySelector(TABLE_BODY_FIRST_ROW_THIRD_DATA).innerText;
-            expect(actualRangeValue).toBe(rangeValue);
-            expect(actualDomainValue).toBe(domainValue);
-        });
-    });
-});
-
-describe("The LAD Table Set", () => {
-    const ladTableSetKey = 'LadTableSet';
-
-    let openmct,
-        ladPlugin,
-        parent,
-        child,
-        telemetryCount = 3,
-        timeFormat = 'utc',
-        mockTelemetry = getMockTelemetry({ count: telemetryCount, format: timeFormat }),
-        mockObj = getMockObjects({
-            objectKeyStrings: ['ladTable', 'ladTableSet', 'telemetry']
-        }),
-        bounds = {
-            start: 0,
-            end: 4
-        };
-    // add mock telemetry to lad table and lad table to lad table set (composition)
-    mockObj.ladTable.composition.push(mockObj.telemetry.identifier);
-    mockObj.ladTableSet.composition.push(mockObj.ladTable.identifier);
-
-    beforeEach((done) => {
-        const appHolder = document.createElement('div');
-        appHolder.style.width = '640px';
-        appHolder.style.height = '480px';
-
-        openmct = createOpenMct();
-
-        parent = document.createElement('div');
-        child = document.createElement('div');
-        parent.appendChild(child);
-
-        spyOn(openmct.telemetry, 'request').and.returnValue(Promise.resolve([]));
-
-        ladPlugin = new LadPlugin();
-        openmct.install(ladPlugin);
-
-        spyOn(openmct.objects, 'get').and.returnValue(Promise.resolve({}));
-
-        openmct.time.bounds({ start: bounds.start, end: bounds.end });
-
-        openmct.on('start', done);
-        openmct.start(appHolder);
-    });
-
-    afterEach(() => {
-        resetApplicationState(openmct);
-    });
-
-    it("should provide a lad table set view only for lad table set objects", () => {
-        let applicableViews = openmct.objectViews.get(mockObj.ladTableSet),
-            ladTableSetView = applicableViews.find(
-                (viewProvider) => viewProvider.key === ladTableSetKey
-            );
-
-        expect(applicableViews.length).toEqual(1);
-        expect(ladTableSetView).toBeDefined();
-    });
-
-    describe('composition', () => {
-        let ladTableSetCompositionCollection;
-
-        beforeEach(() => {
-            ladTableSetCompositionCollection = openmct.composition.get(mockObj.ladTableSet);
-            ladTableSetCompositionCollection.load();
-        });
-
-        it("should accept lad table objects", () => {
-            expect(() => {
-                ladTableSetCompositionCollection.add(mockObj.ladTable);
-            }).not.toThrow();
-        });
-
-        it("should reject non lad table objects", () => {
-            expect(()=> {
-                ladTableSetCompositionCollection.add(mockObj.telemetry);
-            }).toThrow();
-        });
-    });
-
-    describe("table view", () => {
-        let applicableViews,
-            ladTableSetViewProvider,
-            ladTableSetView,
-            otherObj = getMockObjects({
-                objectKeyStrings: ['ladTable'],
-                overwrite: {
-                    ladTable: {
-                        name: "New LAD Table Object",
-                        identifier: { namespace: "", key: "another-lad-object" }
-                    }
-                }
-            });
-
-        // add another lad table (with telemetry object) object to the lad table set for multi row test
-        otherObj.ladTable.composition.push(mockObj.telemetry.identifier);
-        mockObj.ladTableSet.composition.push(otherObj.ladTable.identifier);
-
-        beforeEach(async () => {
-            let telemetryRequestResolve,
-                ladObjectResolve,
-                anotherLadObjectResolve;
-            let telemetryRequestPromise = new Promise((resolve) => {
-                    telemetryRequestResolve = resolve;
-                }),
-                ladObjectPromise = new Promise((resolve) => {
-                    ladObjectResolve = resolve;
-                }),
-                anotherLadObjectPromise = new Promise((resolve) => {
-                    anotherLadObjectResolve = resolve;
-                })
-            openmct.telemetry.request.and.callFake(() => {
-                telemetryRequestResolve(mockTelemetry);
-                return telemetryRequestPromise;
-            });
-            openmct.objects.get.and.callFake((obj) => {
-                if(obj.key === 'lad-object') {
-                    ladObjectResolve(mockObj.ladObject);
-                    return ladObjectPromise;
-                } else if(obj.key === 'another-lad-object') {
-                    anotherLadObjectResolve(otherObj.ladObject);
-                    return anotherLadObjectPromise;
-                }
-
-                return Promise.resolve({});
-            });
-
-            openmct.time.bounds({ start: bounds.start, end: bounds.end });
-
-            applicableViews = openmct.objectViews.get(mockObj.ladTableSet);
-            ladTableSetViewProvider = applicableViews.find((viewProvider) => viewProvider.key === ladTableSetKey);
-            ladTableSetView = ladTableSetViewProvider.view(mockObj.ladTableSet, [mockObj.ladTableSet]);
-            ladTableSetView.show(child, true);
-
-            await Promise.all([telemetryRequestPromise, ladObjectPromise, anotherLadObjectPromise]);
-            await Vue.nextTick();
-            return;
-        });
-
-        it("should show one row per lad table object in the composition", () => {
-            const rowCount = parent.querySelectorAll(LAD_SET_TABLE_HEADERS).length;
-            expect(rowCount).toBe(mockObj.ladTableSet.composition.length);
-            pending();
-        });
-    });
-});
-

src/plugins/URLTimeSettingsSynchronizer/URLTimeSettingsSynchronizer.js

@@ -1,237 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import {
-    getAllSearchParams,
-    setAllSearchParams
-} from 'utils/openmctLocation';
-
-const TIME_EVENTS = ['timeSystem', 'clock', 'clockOffsets'];
-const SEARCH_MODE = 'tc.mode';
-const SEARCH_TIME_SYSTEM = 'tc.timeSystem';
-const SEARCH_START_BOUND = 'tc.startBound';
-const SEARCH_END_BOUND = 'tc.endBound';
-const SEARCH_START_DELTA = 'tc.startDelta';
-const SEARCH_END_DELTA = 'tc.endDelta';
-const MODE_FIXED = 'fixed';
-
-export default class URLTimeSettingsSynchronizer {
-    constructor(openmct) {
-        this.openmct = openmct;
-        this.isUrlUpdateInProgress = false;
-
-        this.initialize = this.initialize.bind(this);
-        this.destroy = this.destroy.bind(this);
-        this.updateTimeSettings = this.updateTimeSettings.bind(this);
-        this.setUrlFromTimeApi = this.setUrlFromTimeApi.bind(this);
-        this.updateBounds = this.updateBounds.bind(this);
-
-        openmct.on('start', this.initialize);
-        openmct.on('destroy', this.destroy);
-    }
-
-    initialize() {
-        this.updateTimeSettings();
-
-        window.addEventListener('hashchange', this.updateTimeSettings);
-        TIME_EVENTS.forEach(event => {
-            this.openmct.time.on(event, this.setUrlFromTimeApi);
-        });
-        this.openmct.time.on('bounds', this.updateBounds);
-    }
-
-    destroy() {
-        window.removeEventListener('hashchange', this.updateTimeSettings);
-        this.openmct.off('start', this.initialize);
-        this.openmct.off('destroy', this.destroy);
-
-        TIME_EVENTS.forEach(event => {
-            this.openmct.time.off(event, this.setUrlFromTimeApi);
-        });
-        this.openmct.time.on('bounds', this.updateBounds);
-    }
-
-    updateTimeSettings() {
-        // Prevent from triggering self
-        if (!this.isUrlUpdateInProgress) {
-            let timeParameters = this.parseParametersFromUrl();
-
-            if (this.areTimeParametersValid(timeParameters)) {
-                this.setTimeApiFromUrl(timeParameters);
-            } else {
-                this.setUrlFromTimeApi();
-            }
-        } else {
-            this.isUrlUpdateInProgress = false;
-        }
-    }
-
-    parseParametersFromUrl() {
-        let searchParams = getAllSearchParams();
-
-        let mode = searchParams.get(SEARCH_MODE);
-        let timeSystem = searchParams.get(SEARCH_TIME_SYSTEM);
-
-        let startBound = parseInt(searchParams.get(SEARCH_START_BOUND), 10);
-        let endBound = parseInt(searchParams.get(SEARCH_END_BOUND), 10);
-        let bounds = {
-            start: startBound,
-            end: endBound
-        };
-
-        let startOffset = parseInt(searchParams.get(SEARCH_START_DELTA), 10);
-        let endOffset = parseInt(searchParams.get(SEARCH_END_DELTA), 10);
-        let clockOffsets = {
-            start: 0 - startOffset,
-            end: endOffset
-        };
-
-        return {
-            mode,
-            timeSystem,
-            bounds,
-            clockOffsets
-        };
-    }
-
-    setTimeApiFromUrl(timeParameters) {
-        if (timeParameters.mode === 'fixed') {
-            if (this.openmct.time.timeSystem().key !== timeParameters.timeSystem) {
-                this.openmct.time.timeSystem(
-                    timeParameters.timeSystem,
-                    timeParameters.bounds
-                );
-            } else if (!this.areStartAndEndEqual(this.openmct.time.bounds(), timeParameters.bounds)) {
-                this.openmct.time.bounds(timeParameters.bounds);
-            }
-            if (this.openmct.time.clock()) {
-                this.openmct.time.stopClock();
-            }
-        } else {
-            if (!this.openmct.time.clock() ||
-                this.openmct.time.clock().key !== timeParameters.mode) {
-                this.openmct.time.clock(timeParameters.mode, timeParameters.clockOffsets);
-            } else if (!this.areStartAndEndEqual(this.openmct.time.clockOffsets(), timeParameters.clockOffsets)) {
-                this.openmct.time.clockOffsets(timeParameters.clockOffsets);
-            }
-            if (!this.openmct.time.timeSystem() ||
-                this.openmct.time.timeSystem().key !== timeParameters.timeSystem) {
-                this.openmct.time.timeSystem(timeParameters.timeSystem);
-            }
-        }
-    }
-
-    updateBounds(bounds, isTick) {
-        if (!isTick) {
-            this.setUrlFromTimeApi();
-        }
-    }
-
-    setUrlFromTimeApi() {
-        let searchParams = getAllSearchParams();
-        let clock = this.openmct.time.clock();
-        let bounds = this.openmct.time.bounds();
-        let clockOffsets = this.openmct.time.clockOffsets();
-
-        if (clock === undefined) {
-            searchParams.set(SEARCH_MODE, MODE_FIXED);
-            searchParams.set(SEARCH_START_BOUND, bounds.start);
-            searchParams.set(SEARCH_END_BOUND, bounds.end);
-
-            searchParams.delete(SEARCH_START_DELTA);
-            searchParams.delete(SEARCH_END_DELTA);
-        } else {
-            searchParams.set(SEARCH_MODE, clock.key);
-
-            if (clockOffsets !== undefined) {
-                searchParams.set(SEARCH_START_DELTA, 0 - clockOffsets.start);
-                searchParams.set(SEARCH_END_DELTA, clockOffsets.end);
-            } else {
-                searchParams.delete(SEARCH_START_DELTA);
-                searchParams.delete(SEARCH_END_DELTA);
-            }
-            searchParams.delete(SEARCH_START_BOUND);
-            searchParams.delete(SEARCH_END_BOUND);
-        }
-
-        searchParams.set(SEARCH_TIME_SYSTEM, this.openmct.time.timeSystem().key);
-        this.isUrlUpdateInProgress = true;
-        setAllSearchParams(searchParams);
-    }
-
-    areTimeParametersValid(timeParameters) {
-        let isValid = false;
-
-        if (this.isModeValid(timeParameters.mode) &&
-            this.isTimeSystemValid(timeParameters.timeSystem)) {
-
-            if (timeParameters.mode === 'fixed') {
-                isValid = this.areStartAndEndValid(timeParameters.bounds);
-            } else {
-                isValid = this.areStartAndEndValid(timeParameters.clockOffsets);
-            }
-        }
-
-        return isValid;
-    }
-
-    areStartAndEndValid(bounds) {
-        return bounds !== undefined &&
-            bounds.start !== undefined &&
-            bounds.start !== null &&
-            bounds.end !== undefined &&
-            bounds.start !== null &&
-            !isNaN(bounds.start) &&
-            !isNaN(bounds.end);
-    }
-
-    isTimeSystemValid(timeSystem) {
-        let isValid = timeSystem !== undefined;
-        if (isValid) {
-            let timeSystemObject = this.openmct.time.timeSystems.get(timeSystem);
-            isValid = timeSystemObject !== undefined;
-        }
-        return isValid;
-    }
-
-    isModeValid(mode) {
-        let isValid = false;
-
-        if (mode !== undefined &&
-            mode !== null) {
-            isValid = true;
-        }
-
-        if (isValid) {
-            if (mode.toLowerCase() === MODE_FIXED) {
-                isValid = true;
-            } else {
-                isValid = this.openmct.time.clocks.get(mode) !== undefined;
-            }
-        }
-        return isValid;
-    }
-
-    areStartAndEndEqual(firstBounds, secondBounds) {
-        return firstBounds.start === secondBounds.start &&
-            firstBounds.end === secondBounds.end;
-    }
-}

src/plugins/URLTimeSettingsSynchronizer/plugin.js

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

src/plugins/URLTimeSettingsSynchronizer/pluginSpec.js

@@ -1,307 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import {
-    createOpenMct,
-    resetApplicationState
-} from 'utils/testing';
-
-describe("The URLTimeSettingsSynchronizer", () => {
-    let openmct;
-    let testClock;
-    beforeAll(() => resetApplicationState());
-
-    beforeEach((done) => {
-        openmct = createOpenMct();
-        openmct.install(openmct.plugins.LocalTimeSystem());
-        testClock = jasmine.createSpyObj("testClock", ["start", "stop", "tick", "currentValue", "on", "off"]);
-        testClock.key = "test-clock";
-        testClock.currentValue.and.returnValue(0);
-
-        openmct.time.addClock(testClock);
-
-        openmct.on('start', done);
-        openmct.startHeadless();
-    });
-
-    afterEach(() => resetApplicationState(openmct));
-
-    describe("realtime mode", () => {
-        it("when the clock is set via the time API, it is immediately reflected in the URL", () => {
-            //Test expected initial conditions
-            expect(window.location.hash.includes('tc.mode=fixed')).toBe(true);
-
-            openmct.time.clock('local', {start: -1000, end: 100});
-
-            expect(window.location.hash.includes('tc.mode=local')).toBe(true);
-
-            //Test that expected initial conditions are no longer true
-            expect(window.location.hash.includes('tc.mode=fixed')).toBe(false);
-        });
-        it("when offsets are set via the time API, they are immediately reflected in the URL", () => {
-            //Test expected initial conditions
-            expect(window.location.hash.includes('tc.startDelta')).toBe(false);
-            expect(window.location.hash.includes('tc.endDelta')).toBe(false);
-
-            openmct.time.clock('local', {start: -1000, end: 100});
-            expect(window.location.hash.includes('tc.startDelta=1000')).toBe(true);
-            expect(window.location.hash.includes('tc.endDelta=100')).toBe(true);
-
-            openmct.time.clockOffsets({start: -2000, end: 200});
-            expect(window.location.hash.includes('tc.startDelta=2000')).toBe(true);
-            expect(window.location.hash.includes('tc.endDelta=200')).toBe(true);
-
-            //Test that expected initial conditions are no longer true
-            expect(window.location.hash.includes('tc.mode=fixed')).toBe(false);
-        });
-        describe("when set in the url", () => {
-            it("will change from fixed to realtime mode when the mode changes", () => {
-                expectLocationToBeInFixedMode();
-                return switchToRealtimeMode().then(() => {
-                    let clock = openmct.time.clock();
-
-                    expect(clock).toBeDefined();
-                    expect(clock.key).toBe('local');
-                });
-            });
-            it("the clock is correctly set in the API from the URL parameters", () => {
-                return switchToRealtimeMode().then(() => {
-                    let resolveFunction;
-                    return new Promise((resolve) => {
-                        resolveFunction = resolve;
-
-                        //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
-                        //detected in the API.
-                        openmct.time.on('clock', resolveFunction);
-                        let hash = window.location.hash;
-                        hash = hash.replace('tc.mode=local', 'tc.mode=test-clock');
-                        window.location.hash = hash;
-                    }).then(() => {
-                        let clock = openmct.time.clock();
-                        expect(clock).toBeDefined();
-                        expect(clock.key).toBe('test-clock');
-                        openmct.time.off('clock', resolveFunction);
-                    });
-                });
-            });
-            it("the clock offsets are correctly set in the API from the URL parameters", () => {
-                return switchToRealtimeMode().then(() => {
-                    let resolveFunction;
-                    return new Promise((resolve) => {
-                        resolveFunction = resolve;
-                        //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
-                        //detected in the API.
-                        openmct.time.on('clockOffsets', resolveFunction);
-                        let hash = window.location.hash;
-                        hash = hash.replace('tc.startDelta=1000', 'tc.startDelta=2000');
-                        hash = hash.replace('tc.endDelta=100', 'tc.endDelta=200');
-                        window.location.hash = hash;
-                    }).then(() => {
-                        let clockOffsets = openmct.time.clockOffsets();
-                        expect(clockOffsets).toBeDefined();
-                        expect(clockOffsets.start).toBe(-2000);
-                        expect(clockOffsets.end).toBe(200);
-                        openmct.time.off('clockOffsets', resolveFunction);
-                    });
-                });
-            });
-            it("the time system is correctly set in the API from the URL parameters", () => {
-                return switchToRealtimeMode().then(() => {
-                    let resolveFunction;
-                    return new Promise((resolve) => {
-                        resolveFunction = resolve;
-
-                        //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
-                        //detected in the API.
-                        openmct.time.on('timeSystem', resolveFunction);
-                        let hash = window.location.hash;
-                        hash = hash.replace('tc.timeSystem=utc', 'tc.timeSystem=local');
-                        window.location.hash = hash;
-                    }).then(() => {
-                        let timeSystem = openmct.time.timeSystem();
-                        expect(timeSystem).toBeDefined();
-                        expect(timeSystem.key).toBe('local');
-                        openmct.time.off('timeSystem', resolveFunction);
-                    });
-                });
-            });
-        });
-    });
-    describe("fixed timespan mode", () => {
-        beforeEach(() => {
-            openmct.time.stopClock();
-            openmct.time.timeSystem('utc', {start: 0, end: 1});
-        });
-
-        it("when bounds are set via the time API, they are immediately reflected in the URL", ()=>{
-            //Test expected initial conditions
-            expect(window.location.hash.includes('tc.startBound=0')).toBe(true);
-            expect(window.location.hash.includes('tc.endBound=1')).toBe(true);
-
-            openmct.time.bounds({start: 10, end: 20});
-
-            expect(window.location.hash.includes('tc.startBound=10')).toBe(true);
-            expect(window.location.hash.includes('tc.endBound=20')).toBe(true);
-
-            //Test that expected initial conditions are no longer true
-            expect(window.location.hash.includes('tc.startBound=0')).toBe(false);
-            expect(window.location.hash.includes('tc.endBound=1')).toBe(false);
-        });
-
-        it("when time system is set via the time API, it is immediately reflected in the URL", ()=>{
-            //Test expected initial conditions
-            expect(window.location.hash.includes('tc.timeSystem=utc')).toBe(true);
-
-            openmct.time.timeSystem('local', {start: 20, end: 30});
-
-            expect(window.location.hash.includes('tc.timeSystem=local')).toBe(true);
-
-            //Test that expected initial conditions are no longer true
-            expect(window.location.hash.includes('tc.timeSystem=utc')).toBe(false);
-        });
-        describe("when set in the url", () => {
-            it("time system changes are reflected in the API", () => {
-                let resolveFunction;
-
-                return new Promise((resolve) => {
-                    let timeSystem = openmct.time.timeSystem();
-                    resolveFunction = resolve;
-
-                    expect(timeSystem.key).toBe('utc');
-                    window.location.hash = window.location.hash.replace('tc.timeSystem=utc', 'tc.timeSystem=local');
-
-                    openmct.time.on('timeSystem', resolveFunction);
-                }).then(() => {
-                    let timeSystem = openmct.time.timeSystem();
-                    expect(timeSystem.key).toBe('local');
-
-                    openmct.time.off('timeSystem', resolveFunction);
-                });
-            });
-            it("mode can be changed from realtime to fixed", () => {
-                return switchToRealtimeMode().then(() => {
-                    expectLocationToBeInRealtimeMode();
-
-                    expect(openmct.time.clock()).toBeDefined();
-                }).then(switchToFixedMode).then(() => {
-                    let clock = openmct.time.clock();
-                    expect(clock).not.toBeDefined();
-                });
-            });
-            it("bounds are correctly set in the API from the URL parameters", () => {
-                let resolveFunction;
-
-                expectLocationToBeInFixedMode();
-
-                return new Promise((resolve) => {
-                    resolveFunction = resolve;
-                    openmct.time.on('bounds', resolveFunction);
-                    let hash = window.location.hash;
-                    hash = hash.replace('tc.startBound=0', 'tc.startBound=222')
-                        .replace('tc.endBound=1', 'tc.endBound=333');
-                    window.location.hash = hash;
-                }).then(() => {
-                    let bounds = openmct.time.bounds();
-
-                    expect(bounds).toBeDefined();
-                    expect(bounds.start).toBe(222);
-                    expect(bounds.end).toBe(333);
-                });
-            });
-            it("bounds are correctly set in the API from the URL parameters where only the end bound changes", () => {
-                let resolveFunction;
-
-                expectLocationToBeInFixedMode();
-
-                return new Promise((resolve) => {
-                    resolveFunction = resolve;
-                    openmct.time.on('bounds', resolveFunction);
-                    let hash = window.location.hash;
-                    hash = hash.replace('tc.endBound=1', 'tc.endBound=333');
-                    window.location.hash = hash;
-                }).then(() => {
-                    let bounds = openmct.time.bounds();
-
-                    expect(bounds).toBeDefined();
-                    expect(bounds.start).toBe(0);
-                    expect(bounds.end).toBe(333);
-                });
-            });
-        });
-    });
-
-    function setRealtimeLocationParameters() {
-        let hash = window.location.hash.toString()
-            .replace('tc.mode=fixed', 'tc.mode=local')
-            .replace('tc.startBound=0', 'tc.startDelta=1000')
-            .replace('tc.endBound=1', 'tc.endDelta=100');
-
-        window.location.hash = hash;
-    }
-
-    function setFixedLocationParameters() {
-        let hash = window.location.hash.toString()
-            .replace('tc.mode=local', 'tc.mode=fixed')
-            .replace('tc.timeSystem=utc', 'tc.timeSystem=local')
-            .replace('tc.startDelta=1000', 'tc.startBound=50')
-            .replace('tc.endDelta=100', 'tc.endBound=60');
-
-        window.location.hash = hash;
-    }
-
-    function switchToRealtimeMode() {
-        let resolveFunction;
-        return new Promise((resolve) => {
-            resolveFunction = resolve;
-            openmct.time.on('clock', resolveFunction);
-            setRealtimeLocationParameters();
-        }).then(() => {
-            openmct.time.off('clock', resolveFunction);
-        });
-    }
-
-    function switchToFixedMode() {
-        let resolveFunction;
-        return new Promise((resolve) => {
-            resolveFunction = resolve;
-            //The 'hashchange' event appears to be asynchronous, so we need to wait until a clock change has been
-            //detected in the API.
-            openmct.time.on('clock', resolveFunction);
-            setFixedLocationParameters();
-        }).then(() => {
-            openmct.time.off('clock', resolveFunction);
-        });
-    }
-
-    function expectLocationToBeInRealtimeMode() {
-        expect(window.location.hash.includes('tc.mode=local')).toBe(true);
-        expect(window.location.hash.includes('tc.startDelta=1000')).toBe(true);
-        expect(window.location.hash.includes('tc.endDelta=100')).toBe(true);
-        expect(window.location.hash.includes('tc.mode=fixed')).toBe(false);
-    }
-
-    function expectLocationToBeInFixedMode() {
-        expect(window.location.hash.includes('tc.mode=fixed')).toBe(true);
-        expect(window.location.hash.includes('tc.startBound=0')).toBe(true);
-        expect(window.location.hash.includes('tc.endBound=1')).toBe(true);
-        expect(window.location.hash.includes('tc.mode=local')).toBe(false);
-    }
-});

src/plugins/condition/Condition.js

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

src/plugins/condition/ConditionManager.js

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

src/plugins/condition/ConditionManagerSpec.js

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

src/plugins/condition/ConditionSpec.js

@@ -36,36 +36,28 @@ describe("The condition", function () {
 
     beforeEach (() => {
         conditionManager = jasmine.createSpyObj('conditionManager',
-            ['on', 'updateConditionDescription']
+            ['on']
         );
         mockTelemetryReceived = jasmine.createSpy('listener');
         conditionManager.on('telemetryReceived', mockTelemetryReceived);
-        conditionManager.updateConditionDescription.and.returnValue(function () {});
 
         testTelemetryObject = {
             identifier:{ namespace: "", key: "test-object"},
             type: "test-object",
             name: "Test Object",
             telemetry: {
-                valueMetadatas: [{
+                values: [{
                     key: "some-key",
                     name: "Some attribute",
-                    hints: {
-                        range: 2
-                    }
-                },
-                {
-                    key: "utc",
-                    name: "Time",
-                    format: "utc",
                     hints: {
                         domain: 1
                     }
                 }, {
-                    key: "testSource",
-                    source: "value",
-                    name: "Test",
-                    format: "string"
+                    key: "some-other-key",
+                    name: "Another attribute",
+                    hints: {
+                        range: 1
+                    }
                 }]
             }
         };
@@ -79,7 +71,7 @@ describe("The condition", function () {
         openmct.telemetry = jasmine.createSpyObj('telemetry', ['isTelemetryObject', 'subscribe', 'getMetadata']);
         openmct.telemetry.isTelemetryObject.and.returnValue(true);
         openmct.telemetry.subscribe.and.returnValue(function () {});
-        openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry);
+        openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry.values);
 
         mockTimeSystems = {
             key: 'utc'
@@ -144,38 +136,4 @@ describe("The condition", function () {
         expect(result).toBeTrue();
         expect(conditionObj.criteria.length).toEqual(0);
     });
-
-    it("gets the result of a condition when new telemetry data is received", function () {
-        conditionObj.getResult({
-            value: '0',
-            utc: 'Hi',
-            id: testTelemetryObject.identifier.key
-        });
-        expect(conditionObj.result).toBeTrue();
-    });
-
-    it("gets the result of a condition when new telemetry data is received", function () {
-        conditionObj.getResult({
-            value: '1',
-            utc: 'Hi',
-            id: testTelemetryObject.identifier.key
-        });
-        expect(conditionObj.result).toBeFalse();
-    });
-
-    it("keeps the old result new telemetry data is not used by it", function () {
-        conditionObj.getResult({
-            value: '0',
-            utc: 'Hi',
-            id: testTelemetryObject.identifier.key
-        });
-        expect(conditionObj.result).toBeTrue();
-
-        conditionObj.getResult({
-            value: '1',
-            utc: 'Hi',
-            id: '1234'
-        });
-        expect(conditionObj.result).toBeTrue();
-    });
 });

src/plugins/condition/StyleRuleManager.js

@@ -29,7 +29,6 @@ export default class StyleRuleManager extends EventEmitter {
         this.callback = callback;
         if (suppressSubscriptionOnEdit) {
             this.openmct.editor.on('isEditing', this.toggleSubscription.bind(this));
-            this.isEditing = this.openmct.editor.editing;
         }
         if (styleConfiguration) {
             this.initialize(styleConfiguration);
@@ -157,6 +156,8 @@ export default class StyleRuleManager extends EventEmitter {
         }
         delete this.stopProvidingTelemetry;
         this.conditionSetIdentifier = undefined;
+        this.isEditing = undefined;
+        this.callback = undefined;
     }
 
 }

src/plugins/condition/components/Condition.vue

@@ -30,7 +30,6 @@
 >
     <div class="c-condition-h__drop-target"></div>
     <div v-if="isEditing"
-         :class="{'is-current': condition.id === currentConditionId}"
          class="c-condition c-condition--edit"
     >
         <!-- Edit view -->
@@ -50,7 +49,7 @@
 
             <span class="c-condition__name">{{ condition.configuration.name }}</span>
             <span class="c-condition__summary">
-                <template v-if="!condition.isDefault && !canEvaluateCriteria">
+                <template v-if="!canEvaluateCriteria">
                     Define criteria
                 </template>
                 <span v-else>
@@ -168,7 +167,6 @@
     </div>
     <div v-else
          class="c-condition c-condition--browse"
-         :class="{'is-current': condition.id === currentConditionId}"
     >
         <!-- Browse view -->
         <div class="c-condition__header">
@@ -201,10 +199,6 @@ export default {
         ConditionDescription
     },
     props: {
-        currentConditionId: {
-            type: String,
-            default: ''
-        },
         condition: {
             type: Object,
             required: true
@@ -250,7 +244,7 @@ export default {
             keys.forEach((trigger) => {
                 triggerOptions.push({
                     value: TRIGGER[trigger],
-                    label: `when ${TRIGGER_LABEL[TRIGGER[trigger]]}`
+                    label: TRIGGER_LABEL[TRIGGER[trigger]]
                 });
             });
             return triggerOptions;

src/plugins/condition/components/ConditionCollection.vue

@@ -58,7 +58,6 @@
             <Condition v-for="(condition, index) in conditionCollection"
                        :key="condition.id"
                        :condition="condition"
-                       :current-condition-id="currentConditionId"
                        :condition-index="index"
                        :telemetry="telemetryObjs"
                        :is-editing="isEditing"
@@ -108,8 +107,7 @@ export default {
             moveIndex: undefined,
             isDragging: false,
             defaultOutput: undefined,
-            dragCounter: 0,
-            currentConditionId: ''
+            dragCounter: 0
         };
     },
     watch: {
@@ -147,13 +145,11 @@ export default {
     },
     methods: {
         handleConditionSetResultUpdated(data) {
-            this.currentConditionId = data.conditionId;
             this.$emit('conditionSetResultUpdated', data)
         },
         observeForChanges() {
             this.stopObservingForChanges = this.openmct.objects.observe(this.domainObject, 'configuration.conditionCollection', (newConditionCollection) => {
-                //this forces children to re-render
-                this.conditionCollection = newConditionCollection.map(condition => condition);
+                this.conditionCollection = newConditionCollection;
                 this.updateDefaultCondition();
             });
         },
@@ -201,7 +197,7 @@ export default {
             this.$emit('telemetryUpdated', this.telemetryObjs);
         },
         removeTelemetryObject(identifier) {
-            let index = this.telemetryObjs.findIndex(obj => {
+            let index = _.findIndex(this.telemetryObjs, (obj) => {
                 let objId = this.openmct.objects.makeKeyString(obj.identifier);
                 let id = this.openmct.objects.makeKeyString(identifier);
                 return objId === id;

src/plugins/condition/components/ConditionDescription.vue

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

src/plugins/condition/components/ConditionError.vue

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

src/plugins/condition/components/Criterion.vue

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

src/plugins/condition/components/conditionals.scss

@@ -190,7 +190,6 @@
 }
 
 .c-condition {
-    border: 1px solid transparent;
     flex-direction: column;
     min-width: 400px;
 
@@ -235,12 +234,6 @@
     &__summary {
         flex: 1 1 auto;
     }
-
-    &.is-current {
-        $c: $colorBodyFg;
-        border-color: rgba($c, 0.2);
-        background: rgba($c, 0.2);
-    }
 }
 
 /***************************** CONDITION DEFINITION, EDITING */

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

@@ -108,7 +108,6 @@ import ConditionError from "@/plugins/condition/components/ConditionError.vue";
 import Vue from 'vue';
 import PreviewAction from "@/ui/preview/PreviewAction.js";
 import {getApplicableStylesForItem} from "@/plugins/condition/utils/styleUtils";
-import isEmpty from 'lodash/isEmpty';
 
 export default {
     name: 'ConditionalStylesView',
@@ -289,7 +288,7 @@ export default {
                 delete domainObjectStyles[this.itemId].conditionSetIdentifier;
                 domainObjectStyles[this.itemId].styles = undefined;
                 delete domainObjectStyles[this.itemId].styles;
-                if (isEmpty(domainObjectStyles[this.itemId])) {
+                if (_.isEmpty(domainObjectStyles[this.itemId])) {
                     delete domainObjectStyles[this.itemId];
                 }
             } else {
@@ -300,7 +299,7 @@ export default {
                 domainObjectStyles.styles = undefined;
                 delete domainObjectStyles.styles;
             }
-            if (isEmpty(domainObjectStyles)) {
+            if (_.isEmpty(domainObjectStyles)) {
                 domainObjectStyles = undefined;
             }
 
@@ -338,7 +337,7 @@ export default {
                     delete domainObjectStyles[this.itemId];
                 }
             });
-            if (isEmpty(domainObjectStyles)) {
+            if (_.isEmpty(domainObjectStyles)) {
                 domainObjectStyles = undefined;
             }
             this.persist(domainObjectStyles);

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

@@ -50,7 +50,6 @@
 import StyleEditor from "./StyleEditor.vue";
 import PreviewAction from "@/ui/preview/PreviewAction.js";
 import { getApplicableStylesForItem, getConsolidatedStyleValues, getConditionalStyleForItem } from "@/plugins/condition/utils/styleUtils";
-import isEmpty from 'lodash/isEmpty';
 
 export default {
     name: 'MultiSelectStylesView',
@@ -179,7 +178,7 @@ export default {
                 domainObjectStyles[itemId] = undefined;
                 delete domainObjectStyles[this.itemId];
 
-                if (isEmpty(domainObjectStyles)) {
+                if (_.isEmpty(domainObjectStyles)) {
                     domainObjectStyles = undefined;
                 }
                 this.persist(this.domainObject, domainObjectStyles);
@@ -240,7 +239,7 @@ export default {
                     if (this.isStaticAndConditionalStyles) {
                         this.removeConditionalStyles(domainObjectStyles, item.id);
                     }
-                    if (isEmpty(itemStaticStyle)) {
+                    if (_.isEmpty(itemStaticStyle)) {
                         itemStaticStyle = undefined;
                         domainObjectStyles[item.id] = undefined;
                     } else {

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

@@ -1,614 +0,0 @@
-/*****************************************************************************
-* Open MCT, Copyright (c) 2014-2020, United States Government
-* as represented by the Administrator of the National Aeronautics and Space
-* Administration. All rights reserved.
-*
-* Open MCT is licensed under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0.
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-* License for the specific language governing permissions and limitations
-* under the License.
-*
-* Open MCT includes source code licensed under additional open source
-* licenses. See the Open Source Licenses file (LICENSES.md) included with
-* this source code distribution or the Licensing information page available
-* at runtime from the About dialog for additional information.
-*****************************************************************************/
-
-<template>
-<div class="c-inspector__styles c-inspect-styles">
-    <div v-if="isStaticAndConditionalStyles"
-         class="c-inspect-styles__mixed-static-and-conditional u-alert u-alert--block u-alert--with-icon"
-    >
-        Your selection includes one or more items that use Conditional Styling. Applying a static style below will replace any Conditional Styling with the new choice.
-    </div>
-    <template v-if="!conditionSetDomainObject">
-        <div class="c-inspect-styles__header">
-            Object Style
-        </div>
-        <div class="c-inspect-styles__content">
-            <div v-if="staticStyle"
-                 class="c-inspect-styles__style"
-            >
-                <style-editor class="c-inspect-styles__editor"
-                              :style-item="staticStyle"
-                              :is-editing="allowEditing"
-                              :mixed-styles="mixedStyles"
-                              @persist="updateStaticStyle"
-                />
-            </div>
-            <button
-                v-if="allowEditing"
-                id="addConditionSet"
-                class="c-button c-button--major c-toggle-styling-button labeled"
-                @click="addConditionSet"
-            >
-                <span class="c-cs-button__label">Use Conditional Styling...</span>
-            </button>
-        </div>
-    </template>
-    <template v-else>
-        <div class="c-inspect-styles__header">
-            Conditional Object Styles
-        </div>
-        <div class="c-inspect-styles__content c-inspect-styles__condition-set">
-            <a v-if="conditionSetDomainObject"
-               class="c-object-label icon-conditional"
-               :href="navigateToPath"
-               @click="navigateOrPreview"
-            >
-                <span class="c-object-label__name">{{ conditionSetDomainObject.name }}</span>
-            </a>
-            <template v-if="allowEditing">
-                <button
-                    id="changeConditionSet"
-                    class="c-button labeled"
-                    @click="addConditionSet"
-                >
-                    <span class="c-button__label">Change...</span>
-                </button>
-
-                <button class="c-click-icon icon-x"
-                        title="Remove conditional styles"
-                        @click="removeConditionSet"
-                ></button>
-            </template>
-        </div>
-
-        <div v-if="conditionsLoaded"
-             class="c-inspect-styles__conditions"
-        >
-            <div v-for="(conditionStyle, index) in conditionalStyles"
-                 :key="index"
-                 class="c-inspect-styles__condition"
-                 :class="{'is-current': conditionStyle.conditionId === selectedConditionId}"
-                 @click="applySelectedConditionStyle(conditionStyle.conditionId)"
-            >
-                <condition-error :show-label="true"
-                                 :condition="getCondition(conditionStyle.conditionId)"
-                />
-                <condition-description :show-label="true"
-                                       :condition="getCondition(conditionStyle.conditionId)"
-                />
-                <style-editor class="c-inspect-styles__editor"
-                              :style-item="conditionStyle"
-                              :is-editing="allowEditing"
-                              @persist="updateConditionalStyle"
-                />
-            </div>
-        </div>
-    </template>
-</div>
-</template>
-
-<script>
-
-import StyleEditor from "./StyleEditor.vue";
-import PreviewAction from "@/ui/preview/PreviewAction.js";
-import { getApplicableStylesForItem, getConsolidatedStyleValues, getConditionSetIdentifierForItem } from "@/plugins/condition/utils/styleUtils";
-import ConditionSetSelectorDialog from "@/plugins/condition/components/inspector/ConditionSetSelectorDialog.vue";
-import ConditionError from "@/plugins/condition/components/ConditionError.vue";
-import ConditionDescription from "@/plugins/condition/components/ConditionDescription.vue";
-import Vue from 'vue';
-
-export default {
-    name: 'StylesView',
-    components: {
-        StyleEditor,
-        ConditionError,
-        ConditionDescription
-    },
-    inject: [
-        'openmct',
-        'selection'
-    ],
-    data() {
-        return {
-            staticStyle: undefined,
-            isEditing: this.openmct.editor.isEditing(),
-            mixedStyles: [],
-            isStaticAndConditionalStyles: false,
-            conditionalStyles: [],
-            conditionSetDomainObject: undefined,
-            conditions: undefined,
-            conditionsLoaded: false,
-            navigateToPath: '',
-            selectedConditionId: '',
-            locked: false
-        }
-    },
-    computed: {
-        allowEditing() {
-            return this.isEditing && !this.locked;
-        }
-    },
-    destroyed() {
-        this.removeListeners();
-    },
-    mounted() {
-        this.items = [];
-        this.previewAction = new PreviewAction(this.openmct);
-        this.isMultipleSelection = this.selection.length > 1;
-        this.getObjectsAndItemsFromSelection();
-        if (!this.isMultipleSelection) {
-            let objectStyles = this.getObjectStyles();
-            this.initializeStaticStyle(objectStyles);
-            if (objectStyles && objectStyles.conditionSetIdentifier) {
-                this.openmct.objects.get(objectStyles.conditionSetIdentifier).then(this.initialize);
-                this.conditionalStyles = objectStyles.styles;
-            }
-        } else {
-            this.initializeStaticStyle();
-        }
-        this.openmct.editor.on('isEditing', this.setEditState);
-    },
-    methods: {
-        getObjectStyles() {
-            let objectStyles;
-            if (this.domainObjectsById) {
-                const domainObject = Object.values(this.domainObjectsById)[0];
-                if (domainObject.configuration && domainObject.configuration.objectStyles) {
-                    objectStyles = domainObject.configuration.objectStyles;
-                }
-            } else if (this.items.length) {
-                const itemId = this.items[0].id;
-                if (this.domainObject.configuration && this.domainObject.configuration.objectStyles && this.domainObject.configuration.objectStyles[itemId]) {
-                    objectStyles = this.domainObject.configuration.objectStyles[itemId];
-                }
-            } else if (this.domainObject.configuration && this.domainObject.configuration.objectStyles) {
-                objectStyles = this.domainObject.configuration.objectStyles;
-            }
-            return objectStyles;
-        },
-        setEditState(isEditing) {
-            this.isEditing = isEditing;
-            if (this.isEditing) {
-                if (this.stopProvidingTelemetry) {
-                    this.stopProvidingTelemetry();
-                }
-            } else {
-                this.subscribeToConditionSet();
-            }
-        },
-        enableConditionSetNav() {
-            this.openmct.objects.getOriginalPath(this.conditionSetDomainObject.identifier).then(
-                (objectPath) => {
-                    this.objectPath = objectPath;
-                    this.navigateToPath = '#/browse/' + this.objectPath
-                        .map(o => o && this.openmct.objects.makeKeyString(o.identifier))
-                        .reverse()
-                        .join('/');
-                }
-            );
-        },
-        navigateOrPreview(event) {
-            // If editing, display condition set in Preview overlay; otherwise nav to it while browsing
-            if (this.openmct.editor.isEditing()) {
-                event.preventDefault();
-                this.previewAction.invoke(this.objectPath);
-            }
-        },
-        isItemType(type, item) {
-            return item && (item.type === type);
-        },
-        hasConditionalStyle(domainObject, layoutItem) {
-            const id = layoutItem ? layoutItem.id : undefined;
-            return getConditionSetIdentifierForItem(domainObject, id) !== undefined;
-        },
-        getObjectsAndItemsFromSelection() {
-            let domainObject;
-            let subObjects = [];
-            let itemsWithConditionalStyles = 0;
-
-            //multiple selection
-            let itemInitialStyles = [];
-            let itemStyle;
-            this.selection.forEach((selectionItem) => {
-                const item = selectionItem[0].context.item;
-                const layoutItem = selectionItem[0].context.layoutItem;
-                const layoutDomainObject = selectionItem[0].context.item;
-                const isChildItem = selectionItem.length > 1;
-
-                if (layoutDomainObject && layoutDomainObject.locked) {
-                    this.locked = true;
-                }
-
-                if (!isChildItem) {
-                    domainObject = item;
-                    itemStyle = getApplicableStylesForItem(item);
-                    if (this.hasConditionalStyle(item)) {
-                        itemsWithConditionalStyles += 1;
-                    }
-                } else {
-                    this.canHide = true;
-                    domainObject = selectionItem[1].context.item;
-                    if (item && !layoutItem || this.isItemType('subobject-view', layoutItem)) {
-                        subObjects.push(item);
-                        itemStyle = getApplicableStylesForItem(item);
-                        if (this.hasConditionalStyle(item)) {
-                            itemsWithConditionalStyles += 1;
-                        }
-                    } else {
-                        itemStyle = getApplicableStylesForItem(domainObject, layoutItem || item);
-                        this.items.push({
-                            id: layoutItem.id,
-                            applicableStyles: itemStyle
-                        });
-                        if (this.hasConditionalStyle(item, layoutItem)) {
-                            itemsWithConditionalStyles += 1;
-                        }
-                    }
-                }
-                itemInitialStyles.push(itemStyle);
-            });
-            this.isStaticAndConditionalStyles = this.isMultipleSelection && itemsWithConditionalStyles;
-            const {styles, mixedStyles} = getConsolidatedStyleValues(itemInitialStyles);
-            this.initialStyles = styles;
-            this.mixedStyles = mixedStyles;
-
-            this.domainObject = domainObject;
-            this.removeListeners();
-            if (this.domainObject) {
-                this.stopObserving = this.openmct.objects.observe(this.domainObject, '*', newDomainObject => this.domainObject = newDomainObject);
-                this.stopObservingItems = this.openmct.objects.observe(this.domainObject, 'configuration.items', this.updateDomainObjectItemStyles);
-            }
-
-            subObjects.forEach(this.registerListener);
-        },
-        updateDomainObjectItemStyles(newItems) {
-            let keys = Object.keys(this.domainObject.configuration.objectStyles || {});
-            keys.forEach((key) => {
-                if (this.isKeyItemId(key)) {
-                    if (!(newItems.find(item => item.id === key))) {
-                        this.removeItemStyles(key);
-                    }
-                }
-            });
-        },
-        isKeyItemId(key) {
-            return (key !== 'styles') &&
-                (key !== 'staticStyle') &&
-                (key !== 'defaultConditionId') &&
-                (key !== 'selectedConditionId') &&
-                (key !== 'conditionSetIdentifier');
-        },
-        registerListener(domainObject) {
-            let id = this.openmct.objects.makeKeyString(domainObject.identifier);
-
-            if (!this.domainObjectsById) {
-                this.domainObjectsById = {};
-            }
-
-            if (!this.domainObjectsById[id]) {
-                this.domainObjectsById[id] = domainObject;
-                this.observeObject(domainObject, id);
-            }
-        },
-        observeObject(domainObject, id) {
-            let unobserveObject = this.openmct.objects.observe(domainObject, '*', (newObject) => {
-                this.domainObjectsById[id] = JSON.parse(JSON.stringify(newObject));
-            });
-            this.unObserveObjects.push(unobserveObject);
-        },
-        removeListeners() {
-            if (this.stopObserving) {
-                this.stopObserving();
-            }
-            if (this.stopObservingItems) {
-                this.stopObservingItems();
-            }
-
-            if (this.stopProvidingTelemetry) {
-                this.stopProvidingTelemetry();
-            }
-
-            if (this.unObserveObjects) {
-                this.unObserveObjects.forEach((unObserveObject) => {
-                    unObserveObject();
-                });
-            }
-            this.unObserveObjects = [];
-        },
-        subscribeToConditionSet() {
-            if (this.stopProvidingTelemetry) {
-                this.stopProvidingTelemetry();
-            }
-            if (this.conditionSetDomainObject) {
-                this.openmct.telemetry.request(this.conditionSetDomainObject)
-                    .then(output => {
-                        if (output && output.length) {
-                            this.handleConditionSetResultUpdated(output[0]);
-                        }
-                    });
-                this.stopProvidingTelemetry = this.openmct.telemetry.subscribe(this.conditionSetDomainObject, this.handleConditionSetResultUpdated.bind(this));
-            }
-        },
-        handleConditionSetResultUpdated(resultData) {
-            this.selectedConditionId = resultData ? resultData.conditionId : '';
-        },
-        initialize(conditionSetDomainObject) {
-            //If there are new conditions in the conditionSet we need to set those styles to default
-            this.conditionSetDomainObject = conditionSetDomainObject;
-            this.enableConditionSetNav();
-            this.initializeConditionalStyles();
-        },
-        initializeConditionalStyles() {
-            if (!this.conditions) {
-                this.conditions = {};
-            }
-            let conditionalStyles = [];
-            this.conditionSetDomainObject.configuration.conditionCollection.forEach((conditionConfiguration, index) => {
-                if (conditionConfiguration.isDefault) {
-                    this.selectedConditionId = conditionConfiguration.id;
-                }
-                this.conditions[conditionConfiguration.id] = conditionConfiguration;
-                let foundStyle = this.findStyleByConditionId(conditionConfiguration.id);
-                if (foundStyle) {
-                    foundStyle.style = Object.assign((this.canHide ? { isStyleInvisible: '' } : {}), this.initialStyles, foundStyle.style);
-                    conditionalStyles.push(foundStyle);
-                } else {
-                    conditionalStyles.splice(index, 0, {
-                        conditionId: conditionConfiguration.id,
-                        style: Object.assign((this.canHide ? { isStyleInvisible: '' } : {}), this.initialStyles)
-                    });
-                }
-            });
-            //we're doing this so that we remove styles for any conditions that have been removed from the condition set
-            this.conditionalStyles = conditionalStyles;
-            this.conditionsLoaded = true;
-            this.getAndPersistStyles(null, this.selectedConditionId);
-            if (!this.isEditing) {
-                this.subscribeToConditionSet();
-            }
-        },
-        //TODO: Double check how this works for single styles
-        initializeStaticStyle(objectStyles) {
-            let staticStyle = objectStyles && objectStyles.staticStyle;
-            if (staticStyle) {
-                this.staticStyle = {
-                    style: Object.assign({}, this.initialStyles, staticStyle.style)
-                };
-            } else {
-                this.staticStyle = {
-                    style: Object.assign({}, this.initialStyles)
-                };
-            }
-        },
-        removeItemStyles(itemId) {
-            let domainObjectStyles =  (this.domainObject.configuration && this.domainObject.configuration.objectStyles) || {};
-            if (itemId && domainObjectStyles[itemId]) {
-                delete domainObjectStyles[itemId];
-
-                if (Object.keys(domainObjectStyles).length <= 0) {
-                    domainObjectStyles = undefined;
-                }
-                this.persist(this.domainObject, domainObjectStyles);
-            }
-        },
-        findStyleByConditionId(id) {
-            return this.conditionalStyles.find(conditionalStyle => conditionalStyle.conditionId === id);
-        },
-        getCondition(id) {
-            return this.conditions ? this.conditions[id] : {};
-        },
-        addConditionSet() {
-            let conditionSetDomainObject;
-            const handleItemSelection = (item) => {
-                if (item) {
-                    conditionSetDomainObject = item;
-                }
-            };
-            const dismissDialog = (overlay, initialize) => {
-                overlay.dismiss();
-                if (initialize && conditionSetDomainObject) {
-                    this.conditionSetDomainObject = conditionSetDomainObject;
-                    this.conditionalStyles = [];
-                    this.initializeConditionalStyles();
-                }
-            };
-            let vm = new Vue({
-                provide: {
-                    openmct: this.openmct
-                },
-                components: {ConditionSetSelectorDialog},
-                data() {
-                    return {
-                        handleItemSelection
-                    }
-                },
-                template: '<condition-set-selector-dialog @conditionSetSelected="handleItemSelection"></condition-set-selector-dialog>'
-            }).$mount();
-
-            let overlay = this.openmct.overlays.overlay({
-                element: vm.$el,
-                size: 'small',
-                buttons: [
-                    {
-                        label: 'OK',
-                        emphasis: 'true',
-                        callback: () => dismissDialog(overlay, true)
-                    },
-                    {
-                        label: 'Cancel',
-                        callback: () => dismissDialog(overlay, false)
-                    }
-                ],
-                onDestroy: () => vm.$destroy()
-            });
-        },
-        removeConditionSet() {
-            this.conditionSetDomainObject = undefined;
-            this.conditionalStyles = [];
-            let domainObjectStyles =  (this.domainObject.configuration && this.domainObject.configuration.objectStyles) || {};
-            if (this.domainObjectsById) {
-                const domainObjects = Object.values(this.domainObjectsById);
-                domainObjects.forEach(domainObject => {
-                    let objectStyles =  (domainObject.configuration && domainObject.configuration.objectStyles) || {};
-                    this.removeConditionalStyles(objectStyles);
-                    if (objectStyles && Object.keys(objectStyles).length <= 0) {
-                        objectStyles = undefined;
-                    }
-                    this.persist(domainObject, objectStyles);
-                });
-            }
-            if (this.items.length) {
-                this.items.forEach((item) => {
-                    const itemId = item.id;
-                    this.removeConditionalStyles(domainObjectStyles, itemId);
-                    if (domainObjectStyles[itemId] && Object.keys(domainObjectStyles[itemId]).length <= 0) {
-                        delete domainObjectStyles[itemId];
-                    }
-                });
-            }  else {
-                this.removeConditionalStyles(domainObjectStyles);
-            }
-            if (domainObjectStyles && Object.keys(domainObjectStyles).length <= 0) {
-                domainObjectStyles = undefined;
-            }
-            this.persist(this.domainObject, domainObjectStyles);
-
-            if (this.stopProvidingTelemetry) {
-                this.stopProvidingTelemetry();
-            }
-        },
-        removeConditionalStyles(domainObjectStyles, itemId) {
-            if (itemId && domainObjectStyles[itemId]) {
-                domainObjectStyles[itemId].conditionSetIdentifier = undefined;
-                delete domainObjectStyles[itemId].conditionSetIdentifier;
-                domainObjectStyles[itemId].selectedConditionId = undefined;
-                domainObjectStyles[itemId].defaultConditionId = undefined;
-                domainObjectStyles[itemId].styles = undefined;
-                delete domainObjectStyles[itemId].styles;
-            } else {
-                domainObjectStyles.conditionSetIdentifier = undefined;
-                delete domainObjectStyles.conditionSetIdentifier;
-                domainObjectStyles.selectedConditionId = undefined;
-                domainObjectStyles.defaultConditionId = undefined;
-                domainObjectStyles.styles = undefined;
-                delete domainObjectStyles.styles;
-            }
-        },
-        updateStaticStyle(staticStyle, property) {
-            //update the static style for each of the layoutItems as well as each sub object item
-            this.staticStyle = staticStyle;
-            this.removeConditionSet();
-            this.getAndPersistStyles(property);
-        },
-        updateConditionalStyle(conditionStyle, property) {
-            let foundStyle = this.findStyleByConditionId(conditionStyle.conditionId);
-            if (foundStyle) {
-                foundStyle.style = conditionStyle.style;
-                this.selectedConditionId = foundStyle.conditionId;
-                this.getAndPersistStyles(property);
-            }
-        },
-        getAndPersistStyles(property, defaultConditionId) {
-            this.persist(this.domainObject, this.getDomainObjectStyle(this.domainObject, property, this.items, defaultConditionId));
-            if (this.domainObjectsById) {
-                const domainObjects = Object.values(this.domainObjectsById);
-                domainObjects.forEach(domainObject => {
-                    this.persist(domainObject, this.getDomainObjectStyle(domainObject, property, null, defaultConditionId));
-                });
-            }
-            if (!this.items.length && !this.domainObjectsById) {
-                this.persist(this.domainObject, this.getDomainObjectStyle(this.domainObject, property, null, defaultConditionId));
-            }
-            this.isStaticAndConditionalStyles = false;
-            if (property) {
-                let foundIndex = this.mixedStyles.indexOf(property);
-                if (foundIndex > -1) {
-                    this.mixedStyles.splice(foundIndex, 1);
-                }
-            }
-        },
-        getDomainObjectStyle(domainObject, property, items, defaultConditionId) {
-            let objectStyle = {
-                styles: this.conditionalStyles,
-                staticStyle: this.staticStyle,
-                selectedConditionId: this.selectedConditionId
-            };
-            if (defaultConditionId) {
-                objectStyle.defaultConditionId = defaultConditionId;
-            }
-            if (this.conditionSetDomainObject) {
-                objectStyle.conditionSetIdentifier = this.conditionSetDomainObject.identifier;
-            }
-            let domainObjectStyles =  (domainObject.configuration && domainObject.configuration.objectStyles) || {};
-
-            if (items) {
-                items.forEach(item => {
-                    let itemStaticStyle = {};
-                    let itemConditionalStyle = { styles: []};
-                    if (!this.conditionSetDomainObject) {
-                        if (domainObjectStyles[item.id] && domainObjectStyles[item.id].staticStyle) {
-                            itemStaticStyle = Object.assign({}, domainObjectStyles[item.id].staticStyle.style);
-                        }
-                        if (item.applicableStyles[property] !== undefined) {
-                            itemStaticStyle[property] = this.staticStyle.style[property];
-                        }
-                        if (Object.keys(itemStaticStyle).length <= 0) {
-                            itemStaticStyle = undefined;
-                        }
-                        domainObjectStyles[item.id] = { staticStyle: { style: itemStaticStyle } };
-                    } else {
-                        objectStyle.styles.forEach((conditionalStyle, index) => {
-                            let style = {};
-                            Object.keys(item.applicableStyles).concat(['isStyleInvisible']).forEach(key => {
-                                style[key] = conditionalStyle.style[key];
-                            });
-                            itemConditionalStyle.styles.push({
-                                ...conditionalStyle,
-                                style
-                            });
-                        });
-                        domainObjectStyles[item.id] = {
-                            ...domainObjectStyles[item.id],
-                            ...objectStyle,
-                            ...itemConditionalStyle
-                        };
-                    }
-                });
-            } else {
-                domainObjectStyles = {
-                    ...domainObjectStyles,
-                    ...objectStyle
-                };
-            }
-
-            return domainObjectStyles;
-        },
-        applySelectedConditionStyle(conditionId) {
-            this.selectedConditionId = conditionId;
-            this.getAndPersistStyles();
-        },
-        persist(domainObject, style) {
-            this.openmct.objects.mutate(domainObject, 'configuration.objectStyles', style);
-        }
-    }
-}
-</script>

src/plugins/condition/components/inspector/conditional-styles.scss

@@ -65,7 +65,7 @@
 
         &.is-current {
             $c: $colorBodyFg;
-            border-color: rgba($c, 0.2);
+            border-color: rgba($c, 0.5);
             background: rgba($c, 0.2);
         }
 

src/plugins/condition/criterion/AllTelemetryCriterion.js

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

src/plugins/condition/criterion/TelemetryCriterion.js

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

src/plugins/condition/criterion/TelemetryCriterionSpec.js

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

src/plugins/condition/pluginSpec.js

@@ -20,59 +20,25 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import { createOpenMct, resetApplicationState } from "utils/testing";
+import { createOpenMct } from "testTools";
 import ConditionPlugin from "./plugin";
-import StylesView from "./components/inspector/StylesView.vue";
-import Vue from 'vue';
-import {getApplicableStylesForItem} from "./utils/styleUtils";
-import ConditionManager from "@/plugins/condition/ConditionManager";
+
+let openmct = createOpenMct();
+openmct.install(new ConditionPlugin());
+
+let conditionSetDefinition;
+let mockConditionSetDomainObject;
+let element;
+let child;
 
 describe('the plugin', function () {
-    let conditionSetDefinition;
-    let mockConditionSetDomainObject;
-    let mockListener;
-    let element;
-    let child;
-    let openmct;
-    let testTelemetryObject;
 
-    beforeAll(() => {
-        resetApplicationState(openmct);
-    });
-
-    beforeEach((done) => {
-        testTelemetryObject = {
-            identifier:{ namespace: "", key: "test-object"},
-            type: "test-object",
-            name: "Test Object",
-            telemetry: {
-                valueMetadatas: [{
-                    key: "some-key",
-                    name: "Some attribute",
-                    hints: {
-                        range: 2
-                    }
-                },
-                {
-                    key: "utc",
-                    name: "Time",
-                    format: "utc",
-                    hints: {
-                        domain: 1
-                    }
-                }, {
-                    key: "testSource",
-                    source: "value",
-                    name: "Test",
-                    format: "string"
-                }]
-            }
-        };
-
-        openmct = createOpenMct();
-        openmct.install(new ConditionPlugin());
+    beforeAll((done) => {
 
         conditionSetDefinition = openmct.types.get('conditionSet').definition;
+        const appHolder = document.createElement('div');
+        appHolder.style.width = '640px';
+        appHolder.style.height = '480px';
 
         element = document.createElement('div');
         child = document.createElement('div');
@@ -86,16 +52,10 @@ describe('the plugin', function () {
             type: 'conditionSet'
         };
 
-        mockListener = jasmine.createSpy('mockListener');
-
         conditionSetDefinition.initialize(mockConditionSetDomainObject);
 
         openmct.on('start', done);
-        openmct.startHeadless();
-    });
-
-    afterEach(() => {
-        resetApplicationState(openmct);
+        openmct.start(appHolder);
     });
 
     let mockConditionSetObject = {
@@ -134,368 +94,4 @@ describe('the plugin', function () {
         });
 
     });
-
-    describe('the condition set usage for multiple display layout items', () => {
-        let displayLayoutItem;
-        let lineLayoutItem;
-        let boxLayoutItem;
-        let selection;
-        let component;
-        let styleViewComponentObject;
-        const conditionSetDomainObject = {
-            "configuration":{
-                "conditionTestData":[
-                    {
-                        "telemetry":"",
-                        "metadata":"",
-                        "input":""
-                    }
-                ],
-                "conditionCollection":[
-                    {
-                        "id":"39584410-cbf9-499e-96dc-76f27e69885d",
-                        "configuration":{
-                            "name":"Unnamed Condition",
-                            "output":"Sine > 0",
-                            "trigger":"all",
-                            "criteria":[
-                                {
-                                    "id":"85fbb2f7-7595-42bd-9767-a932266c5225",
-                                    "telemetry":{
-                                        "namespace":"",
-                                        "key":"be0ba97f-b510-4f40-a18d-4ff121d5ea1a"
-                                    },
-                                    "operation":"greaterThan",
-                                    "input":[
-                                        "0"
-                                    ],
-                                    "metadata":"sin"
-                                },
-                                {
-                                    "id":"35400132-63b0-425c-ac30-8197df7d5862",
-                                    "telemetry":"any",
-                                    "operation":"enumValueIs",
-                                    "input":[
-                                        "0"
-                                    ],
-                                    "metadata":"state"
-                                }
-                            ]
-                        },
-                        "summary":"Match if all criteria are met: Sine Wave Generator Sine > 0 and any telemetry State is OFF "
-                    },
-                    {
-                        "isDefault":true,
-                        "id":"2532d90a-e0d6-4935-b546-3123522da2de",
-                        "configuration":{
-                            "name":"Default",
-                            "output":"Default",
-                            "trigger":"all",
-                            "criteria":[
-                            ]
-                        },
-                        "summary":""
-                    }
-                ]
-            },
-            "composition":[
-                {
-                    "namespace":"",
-                    "key":"be0ba97f-b510-4f40-a18d-4ff121d5ea1a"
-                },
-                {
-                    "namespace":"",
-                    "key":"077ffa67-e78f-4e99-80e0-522ac33a3888"
-                }
-            ],
-            "telemetry":{
-            },
-            "name":"Condition Set",
-            "type":"conditionSet",
-            "identifier":{
-                "namespace":"",
-                "key":"863012c1-f6ca-4ab0-aed7-fd43d5e4cd12"
-            }
-
-        };
-        const staticStyle = {
-            "style":{
-                "backgroundColor":"#717171",
-                "border":"1px solid #00ffff"
-            }
-        };
-        const conditionalStyle = {
-            "conditionId":"39584410-cbf9-499e-96dc-76f27e69885d",
-            "style":{
-                "isStyleInvisible":"",
-                "backgroundColor":"#717171",
-                "border":"1px solid #ffff00"
-            }
-        };
-
-        beforeEach(() => {
-            displayLayoutItem = {
-                "composition":[
-                ],
-                "configuration":{
-                    "items":[
-                        {
-                            "fill":"#717171",
-                            "stroke":"",
-                            "x":1,
-                            "y":1,
-                            "width":10,
-                            "height":5,
-                            "type":"box-view",
-                            "id":"89b88746-d325-487b-aec4-11b79afff9e8"
-                        },
-                        {
-                            "x":18,
-                            "y":9,
-                            "x2":23,
-                            "y2":4,
-                            "stroke":"#717171",
-                            "type":"line-view",
-                            "id":"57d49a28-7863-43bd-9593-6570758916f0"
-                        }
-                    ],
-                    "layoutGrid":[
-                        10,
-                        10
-                    ]
-                },
-                "name":"Display Layout",
-                "type":"layout",
-                "identifier":{
-                    "namespace":"",
-                    "key":"c5e636c1-6771-4c9c-b933-8665cab189b3"
-                }
-            };
-            lineLayoutItem = {
-                "x":18,
-                "y":9,
-                "x2":23,
-                "y2":4,
-                "stroke":"#717171",
-                "type":"line-view",
-                "id":"57d49a28-7863-43bd-9593-6570758916f0"
-            };
-            boxLayoutItem = {
-                "fill": "#717171",
-                "stroke": "",
-                "x": 1,
-                "y": 1,
-                "width": 10,
-                "height": 5,
-                "type": "box-view",
-                "id": "89b88746-d325-487b-aec4-11b79afff9e8"
-            };
-            selection = [
-                [{
-                    context: {
-                        "layoutItem": lineLayoutItem,
-                        "index":1
-                    }
-                },
-                {
-                    context: {
-                        "item": displayLayoutItem,
-                        "supportsMultiSelect":true
-                    }
-                }],
-                [{
-                    context: {
-                        "layoutItem": boxLayoutItem,
-                        "index": 0
-                    }
-                },
-                {
-                    context: {
-                        item: displayLayoutItem,
-                        "supportsMultiSelect":true
-                    }
-                }]
-            ];
-            let viewContainer = document.createElement('div');
-            child.append(viewContainer);
-            component = new Vue({
-                provide: {
-                    openmct: openmct,
-                    selection: selection
-                },
-                el: viewContainer,
-                components: {
-                    StylesView
-                },
-                template: '<styles-view/>'
-            });
-            return Vue.nextTick().then(() => {
-                styleViewComponentObject = component.$root.$children[0];
-                styleViewComponentObject.setEditState(true);
-            });
-        });
-
-        it('initializes the items in the view', () => {
-            expect(styleViewComponentObject.items.length).toBe(2);
-        });
-
-        it('initializes conditional styles', () => {
-            styleViewComponentObject.conditionSetDomainObject = conditionSetDomainObject;
-            styleViewComponentObject.conditionalStyles = [];
-            styleViewComponentObject.initializeConditionalStyles();
-            expect(styleViewComponentObject.conditionalStyles.length).toBe(2);
-        });
-
-        it('updates applicable conditional styles', () => {
-            styleViewComponentObject.conditionSetDomainObject = conditionSetDomainObject;
-            styleViewComponentObject.conditionalStyles = [];
-            styleViewComponentObject.initializeConditionalStyles();
-            expect(styleViewComponentObject.conditionalStyles.length).toBe(2);
-            styleViewComponentObject.updateConditionalStyle(conditionalStyle, 'border');
-            return Vue.nextTick().then(() => {
-                expect(styleViewComponentObject.domainObject.configuration.objectStyles).toBeDefined();
-                [boxLayoutItem, lineLayoutItem].forEach((item) => {
-                    const itemStyles = styleViewComponentObject.domainObject.configuration.objectStyles[item.id].styles;
-                    expect(itemStyles.length).toBe(2);
-                    const foundStyle = itemStyles.find((style) => {
-                        return style.conditionId === conditionalStyle.conditionId;
-                    });
-                    expect(foundStyle).toBeDefined();
-                    const applicableStyles = getApplicableStylesForItem(styleViewComponentObject.domainObject, item);
-                    const applicableStylesKeys = Object.keys(applicableStyles).concat(['isStyleInvisible']);
-                    Object.keys(foundStyle.style).forEach((key) => {
-                        expect(applicableStylesKeys.indexOf(key)).toBeGreaterThan(-1);
-                        expect(foundStyle.style[key]).toEqual(conditionalStyle.style[key]);
-                    });
-                });
-            });
-        });
-
-        it('updates applicable static styles', () => {
-            styleViewComponentObject.updateStaticStyle(staticStyle, 'border');
-            return Vue.nextTick().then(() => {
-                expect(styleViewComponentObject.domainObject.configuration.objectStyles).toBeDefined();
-                [boxLayoutItem, lineLayoutItem].forEach((item) => {
-                    const itemStyle = styleViewComponentObject.domainObject.configuration.objectStyles[item.id].staticStyle;
-                    expect(itemStyle).toBeDefined();
-                    const applicableStyles = getApplicableStylesForItem(styleViewComponentObject.domainObject, item);
-                    const applicableStylesKeys = Object.keys(applicableStyles).concat(['isStyleInvisible']);
-                    Object.keys(itemStyle.style).forEach((key) => {
-                        expect(applicableStylesKeys.indexOf(key)).toBeGreaterThan(-1);
-                        expect(itemStyle.style[key]).toEqual(staticStyle.style[key]);
-                    });
-                });
-            });
-        });
-
-    });
-
-    describe('the condition check for staleness', () => {
-        let conditionSetDomainObject;
-
-        beforeEach(()=>{
-            conditionSetDomainObject = {
-                "configuration":{
-                    "conditionTestData":[
-                        {
-                            "telemetry":"",
-                            "metadata":"",
-                            "input":""
-                        }
-                    ],
-                    "conditionCollection":[
-                        {
-                            "id":"39584410-cbf9-499e-96dc-76f27e69885d",
-                            "configuration":{
-                                "name":"Unnamed Condition",
-                                "output":"Any stale telemetry",
-                                "trigger":"all",
-                                "criteria":[
-                                    {
-                                        "id":"35400132-63b0-425c-ac30-8197df7d5862",
-                                        "telemetry":"any",
-                                        "operation":"isStale",
-                                        "input":[
-                                            "1"
-                                        ],
-                                        "metadata":"dataReceived"
-                                    }
-                                ]
-                            },
-                            "summary":"Match if all criteria are met: Any telemetry is stale after 5 seconds"
-                        },
-                        {
-                            "isDefault":true,
-                            "id":"2532d90a-e0d6-4935-b546-3123522da2de",
-                            "configuration":{
-                                "name":"Default",
-                                "output":"Default",
-                                "trigger":"all",
-                                "criteria":[
-                                ]
-                            },
-                            "summary":""
-                        }
-                    ]
-                },
-                "composition":[
-                    {
-                        "namespace":"",
-                        "key":"test-object"
-                    }
-                ],
-                "telemetry":{
-                },
-                "name":"Condition Set",
-                "type":"conditionSet",
-                "identifier":{
-                    "namespace":"",
-                    "key":"cf4456a9-296a-4e6b-b182-62ed29cd15b9"
-                }
-
-            };
-        });
-
-        it('should evaluate as stale when telemetry is not received in the allotted time', (done) => {
-
-            let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
-            conditionMgr.on('conditionSetResultUpdated', mockListener);
-            conditionMgr.telemetryObjects = {
-                "test-object": testTelemetryObject
-            };
-            conditionMgr.updateConditionTelemetryObjects();
-            setTimeout(() => {
-                expect(mockListener).toHaveBeenCalledWith({
-                    output: 'Any stale telemetry',
-                    id: { namespace: '', key: 'cf4456a9-296a-4e6b-b182-62ed29cd15b9' },
-                    conditionId: '39584410-cbf9-499e-96dc-76f27e69885d',
-                    utc: undefined
-                });
-                done();
-            }, 1500);
-        });
-
-        it('should not evaluate as stale when telemetry is received in the allotted time', (done) => {
-            const date = Date.now();
-            conditionSetDomainObject.configuration.conditionCollection[0].configuration.criteria[0].input = ["2"];
-            let conditionMgr = new ConditionManager(conditionSetDomainObject, openmct);
-            conditionMgr.on('conditionSetResultUpdated', mockListener);
-            conditionMgr.telemetryObjects = {
-                "test-object": testTelemetryObject
-            };
-            conditionMgr.updateConditionTelemetryObjects();
-            conditionMgr.telemetryReceived(testTelemetryObject, {
-                utc: date
-            });
-            setTimeout(() => {
-                expect(mockListener).toHaveBeenCalledWith({
-                    output: 'Default',
-                    id: { namespace: '', key: 'cf4456a9-296a-4e6b-b182-62ed29cd15b9' },
-                    conditionId: '2532d90a-e0d6-4935-b546-3123522da2de',
-                    utc: undefined
-                });
-                done();
-            }, 1500);
-        });
-    });
 });

src/plugins/condition/utils/constants.js

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

src/plugins/condition/utils/evaluator.js

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

src/plugins/condition/utils/operations.js

@@ -20,6 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
+import _ from 'lodash';
+
 const convertToNumbers = (input) => {
     let numberInputs = [];
     input.forEach(inputValue => numberInputs.push(Number(inputValue)));
@@ -250,12 +252,12 @@ export const OPERATIONS = [
         }
     },
     {
-        name: 'isOneOf',
+        name: 'valueIs',
         operation: function (input) {
             const lhsValue = input[0] !== undefined ? input[0].toString() : '';
             if (input[1]) {
                 const values = input[1].split(',');
-                return values.some((value) => lhsValue === value.toString().trim());
+                return values.find((value) => lhsValue === _.trim(value.toString()));
             }
             return false;
         },
@@ -267,12 +269,12 @@ export const OPERATIONS = [
         }
     },
     {
-        name: 'isNotOneOf',
+        name: 'valueIsNot',
         operation: function (input) {
             const lhsValue = input[0] !== undefined ? input[0].toString() : '';
             if (input[1]) {
                 const values = input[1].split(',');
-                const found = values.some((value) => lhsValue === value.toString().trim());
+                const found = values.find((value) => lhsValue === _.trim(value.toString()));
                 return !found;
             }
             return false;
@@ -283,18 +285,6 @@ export const OPERATIONS = [
         getDescription: function (values) {
             return ' is not one of ' + values[0];
         }
-    },
-    {
-        name: 'isStale',
-        operation: function () {
-            return false;
-        },
-        text: 'is older than',
-        appliesTo: ["number"],
-        inputCount: 1,
-        getDescription: function (values) {
-            return ` is older than ${values[0] || ''} seconds`;
-        }
     }
 ];
 
@@ -302,8 +292,3 @@ export const INPUT_TYPES = {
     'string': 'text',
     'number': 'number'
 };
-
-export const getOperatorText = (operationName, values) => {
-    const found = OPERATIONS.find((operation) => operation.name === operationName);
-    return found ? found.getDescription(values) : '';
-};

src/plugins/condition/utils/operationsSpec.js

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

src/plugins/condition/utils/styleUtils.js

@@ -19,8 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-import isEmpty from 'lodash/isEmpty';
-
 const NONE_VALUE = '__no_value';
 
 const styleProps = {
@@ -124,25 +122,12 @@ export const getConditionalStyleForItem = (domainObject, id) => {
             if (domainObjectStyles[id] && domainObjectStyles[id].conditionSetIdentifier) {
                 return domainObjectStyles[id].styles;
             }
-        } else if (domainObjectStyles.conditionSetIdentifier) {
+        } else if (domainObjectStyles.staticStyle) {
             return domainObjectStyles.styles;
         }
     }
 };
 
-export const getConditionSetIdentifierForItem = (domainObject, id) => {
-    let domainObjectStyles = domainObject && domainObject.configuration && domainObject.configuration.objectStyles;
-    if (domainObjectStyles) {
-        if (id) {
-            if (domainObjectStyles[id] && domainObjectStyles[id].conditionSetIdentifier) {
-                return domainObjectStyles[id].conditionSetIdentifier;
-            }
-        } else if (domainObjectStyles.conditionSetIdentifier) {
-            return domainObjectStyles.conditionSetIdentifier;
-        }
-    }
-};
-
 //Returns either existing static styles or uses SVG defaults if available
 export const getApplicableStylesForItem = (domainObject, item) => {
     const type = item && item.type;
@@ -169,7 +154,7 @@ export const getApplicableStylesForItem = (domainObject, item) => {
 };
 
 export const getStylesWithoutNoneValue = (style) => {
-    if (isEmpty(style) || !style) {
+    if (_.isEmpty(style) || !style) {
         return;
     }
     let styleObj = {};

src/plugins/condition/utils/time.js

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

src/plugins/condition/utils/timeSpec.js

@@ -1,64 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-import { subscribeForStaleness } from "./time";
-
-describe('time related utils', () => {
-    let subscription;
-    let mockListener;
-
-    beforeEach(() => {
-        mockListener = jasmine.createSpy('listener');
-        subscription = subscribeForStaleness(mockListener, 100);
-    });
-
-    describe('subscribe for staleness', () => {
-        it('should call listeners when stale', (done) => {
-            setTimeout(() => {
-                expect(mockListener).toHaveBeenCalled();
-                done();
-            }, 200);
-        });
-
-        it('should update the subscription', (done) => {
-            function updated() {
-                setTimeout(() => {
-                    expect(mockListener).not.toHaveBeenCalled();
-                    done();
-                }, 50);
-            }
-            setTimeout(() => {
-                subscription.update();
-                updated();
-            }, 50);
-        });
-
-        it('should clear the subscription', (done) => {
-            subscription.clear();
-
-            setTimeout(() => {
-                expect(mockListener).not.toHaveBeenCalled();
-                done();
-            }, 200);
-        });
-    });
-
-});

src/plugins/displayLayout/AlphanumericFormatViewProvider.js

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

src/plugins/displayLayout/DisplayLayoutToolbar.js

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

src/plugins/displayLayout/components/BoxView.vue

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

src/plugins/displayLayout/components/DisplayLayout.vue

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

src/plugins/displayLayout/components/ImageView.vue

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

src/plugins/displayLayout/components/LayoutFrame.vue

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

src/plugins/displayLayout/components/LineView.vue

@@ -62,7 +62,6 @@
 <script>
 
 import conditionalStylesMixin from "../mixins/objectStyles-mixin";
-import _ from 'lodash';
 
 const START_HANDLE_QUADRANTS = {
     1: 'c-frame-edit__handle--sw',
@@ -194,13 +193,6 @@ export default {
             }
 
             this.context.index = newIndex;
-        },
-        item(newItem) {
-            if (!this.context) {
-                return;
-            }
-
-            this.context.layoutItem = newItem;
         }
     },
     mounted() {

src/plugins/displayLayout/components/SubobjectView.vue

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

src/plugins/displayLayout/components/TelemetryView.vue

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

src/plugins/displayLayout/components/TextView.vue

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

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

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