update description of resync action and reduce pixel contant for drag handler

Plot waits for element to have width before loading.  Otherwise,
it may make a minmax request with an invalid size parameter.

Fixes https://github.com/nasa/openmct/issues/1974

API.md

@@ -1,3 +1,57 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents** 
+
+- [Building Applications With Open MCT](#building-applications-with-open-mct)
+  - [Scope and purpose of this document](#scope-and-purpose-of-this-document)
+  - [Building From Source](#building-from-source)
+  - [Starting an Open MCT application](#starting-an-open-mct-application)
+  - [Plugins](#plugins)
+    - [Defining and Installing a New Plugin](#defining-and-installing-a-new-plugin)
+  - [Domain Objects and Identifiers](#domain-objects-and-identifiers)
+    - [Object Attributes](#object-attributes)
+    - [Domain Object Types](#domain-object-types)
+  - [Root Objects](#root-objects)
+  - [Object Providers](#object-providers)
+  - [Composition Providers](#composition-providers)
+    - [Adding Composition Providers](#adding-composition-providers)
+    - [Default Composition Provider](#default-composition-provider)
+  - [Telemetry API](#telemetry-api)
+    - [Integrating Telemetry Sources](#integrating-telemetry-sources)
+      - [Telemetry Metadata](#telemetry-metadata)
+        - [Values](#values)
+          - [Value Hints](#value-hints)
+        - [The Time Conductor and Telemetry](#the-time-conductor-and-telemetry)
+      - [Telemetry Providers](#telemetry-providers)
+      - [Telemetry Requests](#telemetry-requests)
+      - [Request Strategies **draft**](#request-strategies-draft)
+        - [`latest` request strategy](#latest-request-strategy)
+        - [`minmax` request strategy](#minmax-request-strategy)
+      - [Telemetry Formats **draft**](#telemetry-formats-draft)
+        - [Registering Formats](#registering-formats)
+      - [Telemetry Data](#telemetry-data)
+        - [Telemetry Datums](#telemetry-datums)
+      - [Limit Evaluators **draft**](#limit-evaluators-draft)
+    - [Telemetry Visualization APIs **draft**](#telemetry-visualization-apis-draft)
+  - [Time API](#time-api)
+    - [Time Systems and Bounds](#time-systems-and-bounds)
+      - [Defining and Registering Time Systems](#defining-and-registering-time-systems)
+      - [Getting and Setting the Active Time System](#getting-and-setting-the-active-time-system)
+    - [Time Bounds](#time-bounds)
+    - [Clocks](#clocks)
+      - [Defining and registering clocks](#defining-and-registering-clocks)
+      - [Getting and setting active clock](#getting-and-setting-active-clock)
+      - [Stopping an active clock](#stopping-an-active-clock)
+      - [Clock Offsets](#clock-offsets)
+    - [Time Events](#time-events)
+      - [List of Time Events](#list-of-time-events)
+    - [The Time Conductor](#the-time-conductor)
+      - [Time Conductor Configuration](#time-conductor-configuration)
+      - [Example conductor configuration](#example-conductor-configuration)
+  - [Included Plugins](#included-plugins)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
 # Building Applications With Open MCT
 
 ## Scope and purpose of this document
@@ -154,7 +208,7 @@ registry.
 
 eg.
 ```javascript
-openmct.types.addType('my-type', {
+openmct.types.addType('example.my-type', {
     name: "My Type",
     description: "This is a type that I added!",
     creatable: true
@@ -162,8 +216,9 @@ openmct.types.addType('my-type', {
 ```
 
 The `addType` function accepts two arguments:
-* A `string` key identifying the type. This key is used when specifying a type 
-for an object.
+* A `string` key identifying the type. This key is used when specifying a type
+for an object.  We recommend prefixing your types with a namespace to avoid
+conflicts with other plugins.
 * An object type specification. An object type definition supports the following 
 attributes      
     * `name`: a `string` naming this object type
@@ -194,7 +249,7 @@ To do so, use the `addRoot` method of the object API.
 eg.
 ```javascript
 openmct.objects.addRoot({
-        namespace: "my-namespace",
+        namespace: "example.namespace",
         key: "my-key"
     });
 ```
@@ -235,13 +290,12 @@ It is expected that the `get` function will return a
 [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) 
 that resolves with the object being requested.
 
-In future, object providers will support other methods to enable other operations 
-with persistence stores, such as creating, updating, and deleting objects.
+In future, object providers will support other methods to enable other operations with persistence stores, such as creating, updating, and deleting objects.
 
 ## Composition Providers
 
-The _composition_ of a domain object is the list of objects it contains, as shown 
-(for example) in the tree for browsing. Open MCT provides a
+The _composition_ of a domain object is the list of objects it contains, as
+shown (for example) in the tree for browsing. Open MCT provides a
 [default solution](#default-composition-provider) for composition, but there
 may be cases where you want to provide the composition of a certain object
 (or type of object) dynamically.
@@ -255,7 +309,7 @@ Composition Provider:
 ```javascript
 openmct.composition.addProvider({
     appliesTo: function (domainObject) {
-        return domainObject.type === 'my-type';
+        return domainObject.type === 'example.my-type';
     },
     load: function (domainObject) {
         return Promise.resolve(myDomainObjects);
@@ -273,8 +327,9 @@ These identifiers will be used to fetch Domain Objects from an [Object Provider]
 
 ### Default Composition Provider
 
-The default composition provider applies to any domain object with a `composition` 
-property. The value of `composition` should be an array of identifiers, e.g.:
+The default composition provider applies to any domain object with a 
+`composition` property. The value of `composition` should be an array of 
+identifiers, e.g.:
 
 ```javascript
 var domainObject = {
@@ -295,13 +350,17 @@ var domainObject = {
 
 ## Telemetry API
 
-The Open MCT telemetry API provides two main sets of interfaces-- one for integrating telemetry data into Open MCT, and another for developing Open MCT visualization plugins utilizing telemetry API.  
+The Open MCT telemetry API provides two main sets of interfaces-- one for
+integrating telemetry data into Open MCT, and another for developing Open MCT
+visualization plugins utilizing the telemetry API.  
 
-The APIs for visualization plugins are still a work in progress and docs may change at any time.  However, the APIs for integrating telemetry metadata into Open MCT are stable and documentation is included below.
+The APIs for visualization plugins are still a work in progress and docs may
+change at any time.  However, the APIs for integrating telemetry metadata into
+Open MCT are stable and documentation is included below.
 
 ### Integrating Telemetry Sources
 
-There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.
+There are two main tasks for integrating telemetry sources-- describing telemetry objects with relevant metadata, and then providing telemetry data for those objects.  You'll use an [Object Provider](#object-providers) to provide objects with the necessary [Telemetry Metadata](#telemetry-metadata), and then register a [Telemetry Provider](#telemetry-providers) to retrieve telemetry data for those objects.  Alternatively, you can register a telemetry metadata provider to provide the necessary telemetry metadata.
 
 For a step-by-step guide to building a telemetry adapter, please see the 
 [Open MCT Tutorials](https://github.com/nasa/openmct-tutorial).
@@ -355,7 +414,7 @@ attribute      | type   | flags    | notes
 ---            |  ---   |  ---     | ---
 `key`          | string | required | unique identifier for this field.  
 `hints`        | object | required | Hints allow views to intelligently select relevant attributes for display, and are required for most views to function.  See section on "Value Hints" below.
-`name`         | string | optional | a human readible label for this field.  If omitted, defaults to `key`.
+`name`         | string | optional | a human readable label for this field.  If omitted, defaults to `key`.
 `source`       | string | optional | identifies the property of a datum where this value is stored.  If omitted, defaults to `key`.
 `format`       | string | optional | a specific format identifier, mapping to a formatter.  If omitted, uses a default formatter.  For enumerations, use `enum`.  For timestamps, use `utc` if you are using utc dates, otherwise use a key mapping to your custom date format.  
 `units`        | string | optional | the units of this value, e.g. `km`, `seconds`, `parsecs`
@@ -383,7 +442,7 @@ In order for the time conductor to work, there will always be an active "time sy
 
 #### Telemetry Providers
 
-Telemetry providers are responsible for providing historical and real time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.
+Telemetry providers are responsible for providing historical and real-time telemetry data for telemetry objects.  Each telemetry provider determines which objects it can provide telemetry for, and then must implement methods to provide telemetry for those objects.
 
 A telemetry provider is a javascript object with up to four methods:
 
@@ -391,6 +450,10 @@ A telemetry provider is a javascript object with up to four methods:
 * `subscribe(domainObject, callback, options)` required if `supportsSubscribe` is implemented.  Establish a subscription for realtime data for the given domain object.  Should invoke `callback` with a single telemetry datum every time data is received.  Must return an unsubscribe function.  Multiple views can subscribe to the same telemetry object, so it should always return a new unsubscribe function.
 * `supportsRequest(domainObject, options)` optional.  Must be implemented to provide historical telemetry.  Should return `true` if the provider supports historical requests for the given domain object.
 * `request(domainObject, options)` required if `supportsRequest` is implemented.  Must return a promise for an array of telemetry datums that fulfills the request.  The `options` argument will include a `start`, `end`, and `domain` attribute representing the query bounds.  For more request properties, see Request Properties below.
+* `supportsMetadata(domainObject)` optional.  Implement and return `true` for objects that you want to provide dynamic metadata for.
+* `getMetadata(domainObject)` required if `supportsMetadata` is implemented.  Must return a valid telemetry metadata definition that includes at least one valueMetadata definition.
+* `supportsLimits(domainObject)` optional.  Implement and return `true` for domain objects that you want to provide a limit evaluator for.
+* `getLimitEvaluator(domainObject)` required if `supportsLimits` is implemented.  Must return a valid LimitEvaluator for a given domain object.
 
 Telemetry providers are registered by calling `openmct.telemetry.addProvider(provider)`, e.g.
 
@@ -398,14 +461,15 @@ Telemetry providers are registered by calling `openmct.telemetry.addProvider(pro
 openmct.telemetry.addProvider({
     supportsRequest: function (domainObject, options) { /*...*/ },
     request: function (domainObject, options) { /*...*/ },
-    supportsSubscribe: function (domainObject, callback, options) { /*...*/ },
-    subscribe: function (domainObject, callback, options) { /*...*/ }
 })
 ```
 
+Note: it is not required to implement all of the methods on every provider.  Depending on the complexity of your implementation, it may be helpful to instantiate and register your realtime, historical, and metadata providers separately.
+
 #### Telemetry Requests
 
 Telemetry requests support time bounded queries. A call to a _Telemetry Provider_'s `request` function will include an `options` argument. These are simply javascript objects with attributes for the request parameters. An example of a telemetry request object with a start and end time is included below:
+
 ```javascript
 {
     start: 1487981997240,
@@ -414,7 +478,54 @@ Telemetry requests support time bounded queries. A call to a _Telemetry Provider
 }
 ```
 
-#### Telemetry Formats
+In this case, the `domain` is the currently selected time-system, and the start and end dates are valid dates in that time system.
+
+The response to a telemetry request is an array of telemetry datums.  
+These datums must be sorted by `domain` in ascending order.
+
+#### Request Strategies **draft**
+
+To improve performance views may request a certain strategy for data reduction.  These are intended to improve visualization performance by reducing the amount of data needed to be sent to the client.  These strategies will be indicated by additional parameters in the request options.  You may choose to handle them or ignore them.  
+
+Note: these strategies are currently being tested in core plugins and may change based on developer feedback.
+
+##### `latest` request strategy
+
+This request is a "depth based" strategy.  When a view is only capable of
+displaying a single value (or perhaps the last ten values), then it can
+use the `latest` request strategy with a `size` parameter that specifies
+the number of results it desires.  The `size` parameter is a hint; views
+must not assume the response will have the exact number of results requested.
+
+example:
+```javascript
+{
+    start: 1487981997240,
+    end: 1487982897240,
+    domain: 'utc',
+    strategy: 'latest',
+    size: 1
+}
+```
+
+This strategy says "I want the lastest data point in this time range".  A provider which recognizes this request should return only one value-- the latest-- in the requested time range.  Depending on your back-end implementation, performing these queries in bulk can be a large performance increase.  These are generally issued by views that are only capable of displaying a single value and only need to show the latest value.
+
+##### `minmax` request strategy
+
+example:
+```javascript
+{
+    start: 1487981997240,
+    end: 1487982897240,
+    domain: 'utc',
+    strategy: 'minmax',
+    size: 720
+}
+```
+
+MinMax queries are issued by plots, and may be issued by other types as well.  The aim is to reduce the amount of data returned but still faithfully represent the full extent of the data.  In order to do this, the view calculates the maximum data resolution it can display (i.e. the number of horizontal pixels in a plot) and sends that as the `size`.  The response should include at least one minimum and one maximum value per point of resolution.
+
+#### Telemetry Formats **draft**
 
 Telemetry format objects define how to interpret and display telemetry data. 
 They have a simple structure:
@@ -484,6 +595,17 @@ The key-value pairs of this object are described by the telemetry metadata of
 a domain object, as discussed in the [Telemetry Metadata](#telemetry-metadata)
 section.
 
+#### Limit Evaluators **draft**
+
+Limit evaluators allow a telemetry integrator to define how limits should be 
+applied to telemetry from a given domain object.  For an example of a limit 
+evaluator, take a look at `examples/generator/SinewaveLimitProvider.js`.
+
+### Telemetry Consumer APIs **draft**
+
+The APIs for requesting telemetry from Open MCT -- e.g. for use in custom views -- are currently in draft state and are being revised.  If you'd like to experiement with them before they are finalized, please contact the team via the contact-us link on our website.
+
+
 ## Time API
 
 Open MCT provides API for managing the temporal state of the application.
@@ -591,7 +713,7 @@ openmct.time.bounds({start: now - ONE_HOUR, now);
 To respond to bounds change events, listen for the [`'bounds'`](#time-events)
 event.
 
-## Clocks
+### Clocks
 
 The Time API can be set to follow a clock source which will cause the bounds
 to be updated automatically whenever the clock source "ticks". A clock is simply
@@ -610,7 +732,7 @@ be defined to tick on some remote timing source.
 The values provided by clocks are simple `number`s, which are interpreted in the
 context of the active [Time System](#defining-and-registering-time-systems).
 
-### Defining and registering clocks
+#### Defining and registering clocks
 
 A clock is an object that defines certain required metadata and functions:
 
@@ -724,7 +846,7 @@ __Note:__ Setting the clock offsets will trigger an immediate bounds change, as
 new bounds will be calculated based on the `currentValue()` of the active clock. 
 Clock offsets are only relevant when a clock source is active.
 
-## Time Events
+### Time Events
 
 The Time API is a standard event emitter; you can register callbacks for events using the `on` method and remove callbacks for events with the `off` method.
 
@@ -766,7 +888,7 @@ The events emitted by the Time API are:
   * `clockOffsets`: The new [clock offsets](#clock-offsets).
 
 
-## The Time Conductor
+### The Time Conductor
 
 The Time Conductor provides a user interface for managing time bounds in Open 
 MCT. It allows a user to select from configured time systems and clocks, and to set bounds and clock offsets.

bower.json

@@ -17,7 +17,7 @@
     "screenfull": "^3.0.0",
     "node-uuid": "^1.4.7",
     "comma-separated-values": "^3.6.4",
-    "file-saver": "^1.3.3",
+    "file-saver": "1.3.3",
     "zepto": "^1.1.6",
     "eventemitter3": "^1.2.0",
     "lodash": "3.10.1",

example/generator/GeneratorMetadataProvider.js

@@ -0,0 +1,108 @@
+define([
+    'lodash'
+], function (
+    _
+) {
+
+    var METADATA_BY_TYPE = {
+        'generator': {
+            values: [
+                {
+                    key: "name",
+                    name: "Name"
+                },
+                {
+                    key: "utc",
+                    name: "Time",
+                    format: "utc",
+                    hints: {
+                        domain: 1
+                    }
+                },
+                {
+                    key: "yesterday",
+                    name: "Yesterday",
+                    format: "utc",
+                    hints: {
+                        domain: 2
+                    }
+                },
+                {
+                    key: "sin",
+                    name: "Sine",
+                    hints: {
+                        range: 1
+                    }
+                },
+                {
+                    key: "cos",
+                    name: "Cosine",
+                    hints: {
+                        range: 2
+                    }
+                }
+            ]
+        },
+        'example.state-generator': {
+            values: [
+                {
+                    key: "name",
+                    name: "Name"
+                },
+                {
+                    key: "utc",
+                    name: "Time",
+                    format: "utc",
+                    hints: {
+                        domain: 1
+                    }
+                },
+                {
+                    key: "state",
+                    source: "value",
+                    name: "State",
+                    format: "enum",
+                    enumerations: [
+                        {
+                            value: 0,
+                            string: "OFF"
+                        },
+                        {
+                            value: 1,
+                            string: "ON"
+                        }
+                    ],
+                    hints: {
+                        range: 1
+                    }
+                },
+                {
+                    key: "value",
+                    name: "Value",
+                    hints: {
+                        range: 2
+                    }
+                }
+            ]
+        }
+    }
+
+    function GeneratorMetadataProvider() {
+
+    }
+
+    GeneratorMetadataProvider.prototype.supportsMetadata = function (domainObject) {
+        return METADATA_BY_TYPE.hasOwnProperty(domainObject.type);
+    };
+
+    GeneratorMetadataProvider.prototype.getMetadata = function (domainObject) {
+        return _.extend(
+                {},
+                domainObject.telemetry,
+                METADATA_BY_TYPE[domainObject.type]
+            );
+    };
+
+    return GeneratorMetadataProvider;
+
+});

example/generator/GeneratorProvider.js

@@ -66,7 +66,7 @@ define([
             if (request && request.hasOwnProperty(prop)) {
                 workerRequest[prop] = request[prop];
             }
-            if (!workerRequest[prop]) {
+            if (!workerRequest.hasOwnProperty(prop)) {
                 workerRequest[prop] = REQUEST_DEFAULTS[prop];
             }
             workerRequest[prop] = Number(workerRequest[prop]);

example/generator/SinewaveLimitCapability.js

@@ -1,87 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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.
- *****************************************************************************/
-/*global define*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        var RED = 0.9,
-            YELLOW = 0.5,
-            LIMITS = {
-                rh: {
-                    cssClass: "s-limit-upr s-limit-red",
-                    low: RED,
-                    high: Number.POSITIVE_INFINITY,
-                    name: "Red High"
-                },
-                rl: {
-                    cssClass: "s-limit-lwr s-limit-red",
-                    high: -RED,
-                    low: Number.NEGATIVE_INFINITY,
-                    name: "Red Low"
-                },
-                yh: {
-                    cssClass: "s-limit-upr s-limit-yellow",
-                    low: YELLOW,
-                    high: RED,
-                    name: "Yellow High"
-                },
-                yl: {
-                    cssClass: "s-limit-lwr s-limit-yellow",
-                    low: -RED,
-                    high: -YELLOW,
-                    name: "Yellow Low"
-                }
-            };
-
-        function SinewaveLimitCapability(domainObject) {
-            return {
-                limits: function (range) {
-                    return LIMITS;
-                },
-                evaluate: function (datum, range) {
-                    range = range || 'sin';
-                    if (datum[range] > RED) {
-                        return LIMITS.rh;
-                    }
-                    if (datum[range] < -RED) {
-                        return LIMITS.rl;
-                    }
-                    if (datum[range] > YELLOW) {
-                        return LIMITS.yh;
-                    }
-                    if (datum[range] < -YELLOW) {
-                        return LIMITS.yl;
-                    }
-                }
-            };
-        }
-
-        SinewaveLimitCapability.appliesTo = function (model) {
-            return model.type === 'generator';
-        };
-
-        return SinewaveLimitCapability;
-    }
-);

example/generator/SinewaveLimitProvider.js

@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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.
+ *****************************************************************************/
+/*global define*/
+
+define([
+
+], function (
+
+) {
+
+    var RED = 0.9,
+        YELLOW = 0.5,
+        LIMITS = {
+            rh: {
+                cssClass: "s-limit-upr s-limit-red",
+                low: RED,
+                high: Number.POSITIVE_INFINITY,
+                name: "Red High"
+            },
+            rl: {
+                cssClass: "s-limit-lwr s-limit-red",
+                high: -RED,
+                low: Number.NEGATIVE_INFINITY,
+                name: "Red Low"
+            },
+            yh: {
+                cssClass: "s-limit-upr s-limit-yellow",
+                low: YELLOW,
+                high: RED,
+                name: "Yellow High"
+            },
+            yl: {
+                cssClass: "s-limit-lwr s-limit-yellow",
+                low: -RED,
+                high: -YELLOW,
+                name: "Yellow Low"
+            }
+        };
+
+    function SinewaveLimitProvider() {
+
+    }
+
+    SinewaveLimitProvider.prototype.supportsLimits = function (domainObject) {
+        return domainObject.type === 'generator';
+    };
+
+    SinewaveLimitProvider.prototype.getLimitEvaluator = function (domainObject) {
+        return {
+            evaluate: function (datum, valueMetadata) {
+                var range = valueMetadata ? valueMetadata.key : 'sin'
+                if (datum[range] > RED) {
+                    return LIMITS.rh;
+                }
+                if (datum[range] < -RED) {
+                    return LIMITS.rl;
+                }
+                if (datum[range] > YELLOW) {
+                    return LIMITS.yh;
+                }
+                if (datum[range] < -YELLOW) {
+                    return LIMITS.yl;
+                }
+            }
+        };
+    };
+
+    return SinewaveLimitProvider;
+});

example/generator/plugin.js

@@ -23,31 +23,17 @@
 
 define([
     "./GeneratorProvider",
-    "./SinewaveLimitCapability",
-    "./StateGeneratorProvider"
+    "./SinewaveLimitProvider",
+    "./StateGeneratorProvider",
+    "./GeneratorMetadataProvider"
 ], function (
     GeneratorProvider,
-    SinewaveLimitCapability,
-    StateGeneratorProvider
+    SinewaveLimitProvider,
+    StateGeneratorProvider,
+    GeneratorMetadataProvider
 ) {
 
-    var legacyExtensions = {
-        "capabilities": [
-            {
-                "key": "limit",
-                "implementation": SinewaveLimitCapability
-            }
-        ]
-    };
-
     return function(openmct){
-        //Register legacy extensions for things not yet supported by the new API
-        Object.keys(legacyExtensions).forEach(function (type){
-            var extensionsOfType = legacyExtensions[type];
-            extensionsOfType.forEach(function (extension) {
-                openmct.legacyExtension(type, extension)
-            })
-        });
 
         openmct.types.addType("example.state-generator", {
             name: "State Generator",
@@ -70,47 +56,7 @@ define([
             ],
             initialize: function (object) {
                 object.telemetry = {
-                    duration: 5,
-                    values: [
-                        {
-                            key: "name",
-                            name: "Name"
-                        },
-                        {
-                            key: "utc",
-                            name: "Time",
-                            format: "utc",
-                            hints: {
-                                domain: 1
-                            }
-                        },
-                        {
-                            key: "state",
-                            source: "value",
-                            name: "State",
-                            format: "enum",
-                            enumerations: [
-                                {
-                                    value: 0,
-                                    string: "OFF"
-                                },
-                                {
-                                    value: 1,
-                                    string: "ON"
-                                }
-                            ],
-                            hints: {
-                                range: 1
-                            }
-                        },
-                        {
-                            key: "value",
-                            name: "Value",
-                            hints: {
-                                range: 2
-                            }
-                        }
-                    ]
+                    duration: 5
                 }
             }
         });
@@ -125,63 +71,58 @@ define([
             form: [
                 {
                     name: "Period",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "period",
                     required: true,
                     property: [
                         "telemetry",
                         "period"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 },
                 {
                     name: "Amplitude",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "amplitude",
                     required: true,
                     property: [
                         "telemetry",
                         "amplitude"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 },
                 {
                     name: "Offset",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "offset",
                     required: true,
                     property: [
                         "telemetry",
                         "offset"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 },
                 {
                     name: "Data Rate (hz)",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "dataRateInHz",
                     required: true,
                     property: [
                         "telemetry",
                         "dataRateInHz"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 },
                 {
                     name: "Phase (radians)",
-                    control: "textfield",
+                    control: "numberfield",
                     cssClass: "l-input-sm l-numeric",
                     key: "phase",
                     required: true,
                     property: [
                         "telemetry",
                         "phase"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
+                    ]
                 }
             ],
             initialize: function (object) {
@@ -190,48 +131,14 @@ define([
                     amplitude: 1,
                     offset: 0,
                     dataRateInHz: 1,
-                    phase: 0,
-                    values: [
-                        {
-                            key: "name",
-                            name: "Name"
-                        },
-                        {
-                            key: "utc",
-                            name: "Time",
-                            format: "utc",
-                            hints: {
-                                domain: 1
-                            }
-                        },
-                        {
-                            key: "yesterday",
-                            name: "Yesterday",
-                            format: "utc",
-                            hints: {
-                                domain: 2
-                            }
-                        },
-                        {
-                            key: "sin",
-                            name: "Sine",
-                            hints: {
-                                range: 1
-                            }
-                        },
-                        {
-                            key: "cos",
-                            name: "Cosine",
-                            hints: {
-                                range: 2
-                            }
-                        }
-                    ]
+                    phase: 0
                 };
             }
         });
 
         openmct.telemetry.addProvider(new GeneratorProvider());
+        openmct.telemetry.addProvider(new GeneratorMetadataProvider());
+        openmct.telemetry.addProvider(new SinewaveLimitProvider());
     };
 
 });

example/plotOptions/bundle.js

@@ -1,146 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, 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.
- *****************************************************************************/
-/*global define*/
-
-define([
-    'legacyRegistry',
-    '../../platform/commonUI/browse/src/InspectorRegion',
-    '../../platform/commonUI/regions/src/Region'
-], function (
-    legacyRegistry,
-    InspectorRegion,
-    Region
-) {
-    "use strict";
-
-    /**
-     * Add a 'plot options' region part to the inspector region for the
-     * Telemetry Plot type only. {@link InspectorRegion} is a default region
-     * implementation that is added automatically to all types. In order to
-     * customize what appears in the inspector region, you can start from a
-     * blank slate by using Region, or customize the default inspector
-     * region by using {@link InspectorRegion}.
-     */
-    var plotInspector = new InspectorRegion(),
-     /**
-      * Two region parts are defined here. One that appears only in browse
-      * mode, and one that appears only in edit mode. For not they both point
-      * to the same representation, but a different key could be used here to
-      * include a customized representation for edit mode.
-      */
-        plotOptionsBrowseRegion = new Region({
-            name: "plot-options",
-            title: "Plot Options",
-            modes: ['browse'],
-            content: {
-                key: "plot-options-browse"
-            }
-        }),
-        plotOptionsEditRegion = new Region({
-            name: "plot-options",
-            title: "Plot Options",
-            modes: ['edit'],
-            content: {
-                key: "plot-options-browse"
-            }
-        });
-
-    /**
-     * Both parts are added, and policies of type 'region' will determine
-     * which is shown based on domain object state. A default policy is
-     * provided which will check the 'modes' attribute of the region part
-     * definition.
-     */
-    plotInspector.addRegion(plotOptionsBrowseRegion);
-    plotInspector.addRegion(plotOptionsEditRegion);
-
-    legacyRegistry.register("example/plotType", {
-        "name": "Plot Type",
-        "description": "Example illustrating registration of a new object type",
-        "extensions": {
-            "types": [
-                {
-                    "key": "plot",
-                    "name": "Example Telemetry Plot",
-                    "cssClass": "icon-telemetry-panel",
-                    "description": "For development use. A plot for displaying telemetry.",
-                    "priority": 10,
-                    "delegates": [
-                        "telemetry"
-                    ],
-                    "features": "creation",
-                    "contains": [
-                        {
-                            "has": "telemetry"
-                        }
-                    ],
-                    "model": {
-                        "composition": []
-                    },
-                    "inspector": plotInspector,
-                    "telemetry": {
-                        "source": "generator",
-                        "domains": [
-                            {
-                                "key": "time",
-                                "name": "Time"
-                            },
-                            {
-                                "key": "yesterday",
-                                "name": "Yesterday"
-                            },
-                            {
-                                "key": "delta",
-                                "name": "Delta",
-                                "format": "example.delta"
-                            }
-                        ],
-                        "ranges": [
-                            {
-                                "key": "sin",
-                                "name": "Sine"
-                            },
-                            {
-                                "key": "cos",
-                                "name": "Cosine"
-                            }
-                        ]
-                    },
-                    "properties": [
-                        {
-                            "name": "Period",
-                            "control": "textfield",
-                            "cssClass": "l-input-sm l-numeric",
-                            "key": "period",
-                            "required": true,
-                            "property": [
-                                "telemetry",
-                                "period"
-                            ],
-                            "pattern": "^\\d*(\\.\\d*)?$"
-                        }
-                    ]
-                }
-            ]
-        }
-    });
-});

index.html

@@ -37,7 +37,8 @@
                 openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
             );
             openmct.install(openmct.plugins.MyItems());
-            openmct.install(openmct.plugins.LocalStorage());
+            // openmct.install(openmct.plugins.LocalStorage());
+            openmct.install(openmct.plugins.CouchDB('http://127.0.0.1:5984/openmct'));
             openmct.install(openmct.plugins.Espresso());
             openmct.install(openmct.plugins.Generator());
             openmct.install(openmct.plugins.ExampleImagery());
@@ -68,6 +69,7 @@
                 ]
             }));
             openmct.install(openmct.plugins.SummaryWidget());
+            openmct.install(openmct.plugins.ActivityModes());
             openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
             openmct.time.timeSystem('utc');
             openmct.start();

karma.conf.js

@@ -37,14 +37,13 @@ module.exports = function(config) {
             {pattern: 'bower_components/**/*.js', included: false},
             {pattern: 'node_modules/d3-*/**/*.js', included: false},
             {pattern: 'node_modules/vue/**/*.js', included: false},
-            {pattern: 'src/**/*.js', included: false},
+            {pattern: 'src/**/*', included: false},
             {pattern: 'example/**/*.html', included: false},
             {pattern: 'example/**/*.js', included: false},
             {pattern: 'example/**/*.json', included: false},
             {pattern: 'platform/**/*.js', included: false},
             {pattern: 'warp/**/*.js', included: false},
             {pattern: 'platform/**/*.html', included: false},
-            {pattern: 'src/**/*.html', included: false},
             'test-main.js'
         ],
 

openmct.js

@@ -49,7 +49,8 @@ requirejs.config({
         "d3-format": "node_modules/d3-format/build/d3-format.min",
         "d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
         "d3-time": "node_modules/d3-time/build/d3-time.min",
-        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min"
+        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min",
+        "d3-dsv": "node_modules/d3-dsv/build/d3-dsv.min"
     },
     "shim": {
         "angular": {

package.json

@@ -1,18 +1,19 @@
 {
   "name": "openmct",
-  "version": "0.12.1-SNAPSHOT",
+  "version": "0.13.3-SNAPSHOT",
   "description": "The Open MCT core platform",
   "dependencies": {
-    "d3-array": "^1.0.2",
-    "d3-axis": "^1.0.4",
-    "d3-collection": "^1.0.2",
-    "d3-color": "^1.0.2",
-    "d3-format": "^1.0.2",
-    "d3-interpolate": "^1.1.3",
-    "d3-scale": "^1.0.4",
-    "d3-selection": "^1.0.3",
-    "d3-time": "^1.0.4",
-    "d3-time-format": "^2.0.3",
+    "d3-array": "1.2.x",
+    "d3-axis": "1.0.x",
+    "d3-collection": "1.0.x",
+    "d3-color": "1.0.x",
+    "d3-format": "1.2.x",
+    "d3-dsv": "^1.0.8",
+    "d3-interpolate": "1.1.x",
+    "d3-scale": "1.0.x",
+    "d3-selection": "1.3.x",
+    "d3-time": "1.0.x",
+    "d3-time-format": "2.1.x",
     "express": "^4.13.1",
     "minimist": "^1.1.1",
     "request": "^2.69.0",
@@ -28,7 +29,7 @@
     "gulp-jshint-html-reporter": "^0.1.3",
     "gulp-rename": "^1.2.2",
     "gulp-requirejs-optimize": "^0.3.1",
-    "gulp-sass": "^2.2.0",
+    "gulp-sass": "^3.1.0",
     "gulp-sourcemaps": "^1.6.0",
     "jasmine-core": "^2.3.0",
     "jscs-html-reporter": "^0.1.0",

platform/commonUI/browse/res/templates/browse/object-properties.html

@@ -38,6 +38,7 @@
                   ng-class="{ last:($index + 1) === contextualParents.length }">
                 <mct-representation key="'label'"
                                     mct-object="parent"
+                                    ng-click="parent.getCapability('action').perform('navigate')"
                                     class="location-item">
                 </mct-representation>
             </span>
@@ -49,6 +50,7 @@
                   ng-class="{ last:($index + 1) === primaryParents.length }">
                 <mct-representation key="'label'"
                                     mct-object="parent"
+                                    ng-click="parent.getCapability('action').perform('navigate')"
                                     class="location-item">
                 </mct-representation>
             </span>

platform/commonUI/edit/src/controllers/ElementsController.js

@@ -88,11 +88,15 @@ define(
          * @private
          */
         ElementsController.prototype.refreshComposition = function (domainObject) {
-            var selectedObjectComposition = domainObject && domainObject.useCapability('composition');
+            var refreshTracker = {};
+            this.currentRefresh = refreshTracker;
 
+            var selectedObjectComposition = domainObject && domainObject.useCapability('composition');
             if (selectedObjectComposition) {
                 selectedObjectComposition.then(function (composition) {
-                    this.scope.composition = composition;
+                    if (this.currentRefresh === refreshTracker) {
+                        this.scope.composition = composition;
+                    }
                 }.bind(this));
             } else {
                 this.scope.composition = [];

platform/commonUI/edit/test/controllers/ElementsControllerSpec.js

@@ -31,11 +31,34 @@ define(
                 mockSelection,
                 mockDomainObject,
                 mockMutationCapability,
+                mockCompositionCapability,
+                mockCompositionObjects,
+                mockComposition,
                 mockUnlisten,
                 selectable = [],
                 controller;
 
+            function mockPromise(value) {
+                return {
+                    then: function (thenFunc) {
+                        return mockPromise(thenFunc(value));
+                    }
+                };
+            }
+
+            function createDomainObject() {
+                return {
+                    useCapability: function () {
+                        return mockCompositionCapability;
+                    }
+                };
+            }
+
             beforeEach(function () {
+                mockComposition = ["a", "b"];
+                mockCompositionObjects = mockComposition.map(createDomainObject);
+                mockCompositionCapability = mockPromise(mockCompositionObjects);
+
                 mockUnlisten = jasmine.createSpy('unlisten');
                 mockMutationCapability = jasmine.createSpyObj("mutationCapability", [
                     "listen"
@@ -45,7 +68,7 @@ define(
                     "getCapability",
                     "useCapability"
                 ]);
-                mockDomainObject.useCapability.andCallThrough();
+                mockDomainObject.useCapability.andReturn(mockCompositionCapability);
                 mockDomainObject.getCapability.andReturn(mockMutationCapability);
 
                 mockScope = jasmine.createSpyObj("$scope", ['$on']);
@@ -65,7 +88,7 @@ define(
                     }
                 };
 
-                spyOn(ElementsController.prototype, 'refreshComposition');
+                spyOn(ElementsController.prototype, 'refreshComposition').andCallThrough();
 
                 controller = new ElementsController(mockScope, mockOpenMCT);
             });
@@ -137,6 +160,25 @@ define(
 
                 expect(mockDomainObject.getCapability).not.toHaveBeenCalledWith('mutation');
             });
+
+            it("checks concurrent changes to composition", function () {
+                var secondMockComposition = ["a", "b", "c"],
+                    secondMockCompositionObjects = secondMockComposition.map(createDomainObject),
+                    firstCompositionCallback,
+                    secondCompositionCallback;
+
+                spyOn(mockCompositionCapability, "then").andCallThrough();
+
+                controller.refreshComposition(mockDomainObject);
+                controller.refreshComposition(mockDomainObject);
+
+                firstCompositionCallback = mockCompositionCapability.then.calls[0].args[0];
+                secondCompositionCallback = mockCompositionCapability.then.calls[1].args[0];
+                secondCompositionCallback(secondMockCompositionObjects);
+                firstCompositionCallback(mockCompositionObjects);
+
+                expect(mockScope.composition).toBe(secondMockCompositionObjects);
+            });
         });
     }
 );

platform/commonUI/general/res/sass/controls/_menus.scss

@@ -77,6 +77,14 @@
     position: relative;
 }
 
+.s-menu {
+    border-radius: $basicCr;
+    @include containerSubtle($colorMenuBg, $colorMenuFg);
+    @include boxShdw($shdwMenu);
+    @include txtShdw($shdwMenuText);
+    padding: $interiorMarginSm 0;
+}
+
 .menu {
     border-radius: $basicCr;
     @include containerSubtle($colorMenuBg, $colorMenuFg);

platform/features/layout/src/FixedController.js

@@ -373,10 +373,10 @@ define(
          */
         FixedController.prototype.updateView = function (telemetryObject, datum) {
             var metadata = this.openmct.telemetry.getMetadata(telemetryObject);
-            var telemetryKeyToDisplay = this.chooseTelemetryKeyToDisplay(metadata);
-            var formattedTelemetryValue = this.getFormattedTelemetryValueForKey(telemetryKeyToDisplay, datum, metadata);
+            var valueMetadata = this.chooseValueMetadataToDisplay(metadata);
+            var formattedTelemetryValue = this.getFormattedTelemetryValueForKey(valueMetadata, datum);
             var limitEvaluator = this.openmct.telemetry.limitEvaluator(telemetryObject);
-            var alarm = limitEvaluator && limitEvaluator.evaluate(datum, telemetryKeyToDisplay);
+            var alarm = limitEvaluator && limitEvaluator.evaluate(datum, valueMetadata);
 
             this.setDisplayedValue(
                 telemetryObject,
@@ -389,29 +389,28 @@ define(
         /**
          * @private
          */
-        FixedController.prototype.getFormattedTelemetryValueForKey = function (telemetryKeyToDisplay, datum, metadata) {
-            var valueMetadata = metadata.value(telemetryKeyToDisplay);
+        FixedController.prototype.getFormattedTelemetryValueForKey = function (valueMetadata, datum) {
             var formatter = this.openmct.telemetry.getValueFormatter(valueMetadata);
 
-            return formatter.format(datum[valueMetadata.key]);
+            return formatter.format(datum);
         };
 
         /**
          * @private
          */
-        FixedController.prototype.chooseTelemetryKeyToDisplay = function (metadata) {
+        FixedController.prototype.chooseValueMetadataToDisplay = function (metadata) {
             // If there is a range value, show that preferentially
-            var telemetryKeyToDisplay = metadata.valuesForHints(['range'])[0];
+            var valueMetadata = metadata.valuesForHints(['range'])[0];
 
             // If no range is defined, default to the highest priority non time-domain data.
-            if (telemetryKeyToDisplay === undefined) {
+            if (valueMetadata === undefined) {
                 var valuesOrderedByPriority = metadata.values();
-                telemetryKeyToDisplay = valuesOrderedByPriority.filter(function (valueMetadata) {
-                    return !(valueMetadata.hints.domain);
+                valueMetadata = valuesOrderedByPriority.filter(function (values) {
+                    return !(values.hints.domain);
                 })[0];
             }
 
-            return telemetryKeyToDisplay.source;
+            return valueMetadata;
         };
 
         /**
@@ -465,7 +464,7 @@ define(
 
             function filterForTelemetryObjects(objects) {
                 return objects.filter(function (object) {
-                    return self.openmct.telemetry.canProvideTelemetry(object);
+                    return self.openmct.telemetry.isTelemetryObject(object);
                 });
             }
 

platform/features/layout/test/FixedControllerSpec.js

@@ -106,8 +106,8 @@ define(
                     'telemetryFormatter',
                     ['format']
                 );
-                mockFormatter.format.andCallFake(function (value) {
-                    return "Formatted " + value;
+                mockFormatter.format.andCallFake(function (valueMetadata) {
+                    return "Formatted " + valueMetadata.value;
                 });
 
                 mockDomainObject = jasmine.createSpyObj(
@@ -150,13 +150,13 @@ define(
                     [
                         'subscribe',
                         'request',
-                        'canProvideTelemetry',
+                        'isTelemetryObject',
                         'getMetadata',
                         'limitEvaluator',
                         'getValueFormatter'
                     ]
                 );
-                mockTelemetryAPI.canProvideTelemetry.andReturn(true);
+                mockTelemetryAPI.isTelemetryObject.andReturn(true);
                 mockTelemetryAPI.request.andReturn(Promise.resolve([]));
 
                 testGrid = [123, 456];
@@ -697,7 +697,7 @@ define(
                             source: 'range'
                         }
                     ]);
-                    var key = controller.chooseTelemetryKeyToDisplay(mockMetadata);
+                    var key = controller.chooseValueMetadataToDisplay(mockMetadata).source;
                     expect(key).toEqual('range');
                 });
 
@@ -719,7 +719,7 @@ define(
                             }
                         }
                     ]);
-                    var key = controller.chooseTelemetryKeyToDisplay(mockMetadata);
+                    var key = controller.chooseValueMetadataToDisplay(mockMetadata).source;
                     expect(key).toEqual('image');
                 });
 

platform/features/table/src/controllers/TelemetryTableController.js

@@ -399,14 +399,14 @@ define(
             var compositionApi = this.openmct.composition;
 
             function filterForTelemetry(objects) {
-                return objects.filter(telemetryApi.canProvideTelemetry.bind(telemetryApi));
+                return objects.filter(telemetryApi.isTelemetryObject.bind(telemetryApi));
             }
 
             /*
              * If parent object is a telemetry object, subscribe to it. Do not
              * test composees.
              */
-            if (telemetryApi.canProvideTelemetry(this.domainObject)) {
+            if (telemetryApi.isTelemetryObject(this.domainObject)) {
                 return Promise.resolve([this.domainObject]);
             } else {
                 /*

platform/features/table/test/controllers/TelemetryTableControllerSpec.js

@@ -91,7 +91,7 @@ define(
                 mockScope.domainObject = mockDomainObject;
 
                 mockTelemetryAPI = jasmine.createSpyObj("telemetryAPI", [
-                    "canProvideTelemetry",
+                    "isTelemetryObject",
                     "subscribe",
                     "getMetadata",
                     "commonValuesForHints",
@@ -117,7 +117,7 @@ define(
                     return formatter;
                 });
 
-                mockTelemetryAPI.canProvideTelemetry.andReturn(false);
+                mockTelemetryAPI.isTelemetryObject.andReturn(false);
 
                 mockTimeout = jasmine.createSpy("timeout");
                 mockTimeout.andReturn(1); // Return something
@@ -199,7 +199,7 @@ define(
                     mockComposition.load.andReturn(Promise.resolve(mockChildren));
                     mockCompositionAPI.get.andReturn(mockComposition);
 
-                    mockTelemetryAPI.canProvideTelemetry.andCallFake(function (obj) {
+                    mockTelemetryAPI.isTelemetryObject.andCallFake(function (obj) {
                         return obj.identifier.key === mockTelemetryObject.identifier.key;
                     });
 
@@ -287,7 +287,7 @@ define(
                     mockChildren = mockChildren.concat(mockTelemetryChildren);
                     mockComposition.load.andReturn(Promise.resolve(mockChildren));
 
-                    mockTelemetryAPI.canProvideTelemetry.andCallFake(function (object) {
+                    mockTelemetryAPI.isTelemetryObject.andCallFake(function (object) {
                         if (object === mockTelemetryObject) {
                             return false;
                         } else {

platform/features/timeline/bundle.js

@@ -204,7 +204,10 @@ define([
                         "composition": [],
                         "start": {
                             "timestamp": 0
-                        }
+                        },
+                        "activityStart": {},
+                        "activityDuration": {},
+                        "activityEnd": {}
                     }
                 },
                 {
@@ -341,7 +344,7 @@ define([
                                         "cssClass": "icon-plot-resource",
                                         "description": "Graph Resource Utilization",
                                         "control": "button",
-                                        "method": "toggleGraph"
+                                        "method": "test"
                                     },
                                     {
                                         "cssClass": "icon-activity-mode",
@@ -374,7 +377,36 @@ define([
                                         "description": "Edit Properties...",
                                         "control": "button",
                                         "method": "properties"
+                                    },
+                                    {
+                                        "cssClass": "icon-duplicate",
+                                        "description": "Make copies of activities",
+                                        "control": "dialog-button",
+                                        "dialog": {
+                                            "control": "textfield",
+                                            "name": "Number of copies (1 to 5)",
+                                            "cssClass": "l-input-sm numeric"
+                                        },
+                                        "property": "makeCopies"
+                                    },
+                                    {
+                                        "cssClass": "icon-layers",
+                                        "description": "Fragment Activity",
+                                        "control": "dialog-button",
+                                        "dialog": {
+                                            "control": "textfield",
+                                            "name": "Number of fragments (2 to 5)",
+                                            "cssClass": "l-input-sm numeric"
+                                        },
+                                        "property": "fragment"
+                                    },
+                                    {
+                                        "cssClass": "icon-resync",
+                                        "description": "Update Duration from imported activity",
+                                        "control": "button",
+                                        "method": "updateDuration"
                                     }
+
                                 ]
                             },
                             {
@@ -464,7 +496,8 @@ define([
                         "$scope",
                         "$q",
                         "objectLoader",
-                        "TIMELINE_MINIMUM_DURATION"
+                        "TIMELINE_MINIMUM_DURATION",
+                        "openmct"
                     ]
                 },
                 {

platform/features/timeline/res/templates/timeline.html

@@ -23,7 +23,7 @@
      ng-click="$event.stopPropagation()"
      ng-controller="TimelineController as timelineController">
 
-<mct-split-pane anchor="left" class="abs" position="pane.x">
+<mct-split-pane anchor="left" class="abs" position="pane.x" alias="timelineCenter">
     <!-- LEFT PANE: TABULAR AND RESOURCE LEGEND AREAS -->
     <mct-split-pane anchor="bottom"
                     position="pane.y"

platform/features/timeline/src/TimelineConstants.js

@@ -25,7 +25,7 @@
  */
 define({
     // Pixel width of start/end handles
-    HANDLE_WIDTH: 32,
+    HANDLE_WIDTH: 16,
     // Pixel tolerance for snapping behavior
     SNAP_WIDTH: 16
 });

platform/features/timeline/src/capabilities/ActivityTimespan.js

@@ -21,27 +21,56 @@
  *****************************************************************************/
 
 define(
-    [],
-    function () {
-
+    ['EventEmitter'],
+    function (EventEmitter) {
         /**
          * Describes the time span of an activity object.
          * @param model the activity's object model
          */
-        function ActivityTimespan(model, mutation) {
+        function ActivityTimespan(model, mutation, parent) {
+            var parentTimelineModel = parent.getModel(),
+                parentMutation = parent.getCapability('mutation');
+
+            function getTimelineActivityStart(domainObjectModel) {
+                if (domainObjectModel.activityStart && domainObjectModel.activityStart[model.id]) {
+                    return domainObjectModel.activityStart[model.id];
+                } else {
+                    return model.start.timestamp;
+                }
+            }
+
+            function getTimelineActivityDuration(domainObjectModel) {
+                if (domainObjectModel.activityDuration && domainObjectModel.activityDuration[model.id]) {
+                    return domainObjectModel.activityDuration[model.id];
+                } else {
+                    return model.duration.timestamp;
+                }
+            }
+
+            function getTimelineActivityEnd(domainObjectModel) {
+                if (domainObjectModel.activityEnd && domainObjectModel.activityEnd[model.id]) {
+                    return domainObjectModel.activityEnd[model.id];
+                } else {
+                    return getTimelineActivityStart(parentTimelineModel) + getTimelineActivityDuration(parentTimelineModel);
+                }
+            }
+
             // Get the start time for this timeline
             function getStart() {
-                return model.start.timestamp;
+                return getTimelineActivityStart(parentTimelineModel);
             }
 
             // Get the end time for this timeline
             function getEnd() {
-                return model.start.timestamp + model.duration.timestamp;
+                return getTimelineActivityEnd(parentTimelineModel);
             }
 
             // Get the duration of this timeline
-            function getDuration() {
-                return model.duration.timestamp;
+            function getDuration(flag) {
+                if (flag === 'model') {
+                    return model.duration.timestamp;
+                }
+                return getTimelineActivityDuration(parentTimelineModel);
             }
 
             // Get the epoch used by this timeline
@@ -51,27 +80,36 @@ define(
 
             // Set the start time associated with this object
             function setStart(value) {
-                var end = getEnd();
-                mutation.mutate(function (m) {
-                    m.start.timestamp = Math.max(value, 0);
-                    // Update duration to keep end time
-                    m.duration.timestamp = Math.max(end - value, 0);
-                }, model.modified);
+
+                parentMutation.mutate(function (m) {
+                    if (!m.activityStart) {
+                        m.activityStart = {};
+                    }
+
+                    m.activityStart[model.id] = Math.max(value, 0);
+                });
             }
 
             // Set the duration associated with this object
             function setDuration(value) {
-                mutation.mutate(function (m) {
-                    m.duration.timestamp = Math.max(value, 0);
-                }, model.modified);
+                parentMutation.mutate(function (m) {
+                    if (!m.activityDuration) {
+                        m.activityDuration = {};
+                    }
+
+                    m.activityDuration[model.id] = Math.max(value, 0);
+                });
             }
 
             // Set the end time associated with this object
             function setEnd(value) {
-                var start = getStart();
-                mutation.mutate(function (m) {
-                    m.duration.timestamp = Math.max(value - start, 0);
-                }, model.modified);
+                parentMutation.mutate(function (m) {
+                    if (!m.activityEnd) {
+                        m.activityEnd = {};
+                    }
+
+                    m.activityEnd[model.id] = Math.max(value, 0);
+                });
             }
 
             return {
@@ -110,7 +148,15 @@ define(
                  * start and end times.
                  * @returns {string} the epoch
                  */
-                getEpoch: getEpoch
+                getEpoch: getEpoch,
+
+                getModel: function () {
+                    return model;
+                },
+
+                getParent: function () {
+                    return parent;
+                }
             };
         }
 

platform/features/timeline/src/capabilities/ActivityTimespanCapability.js

@@ -32,11 +32,15 @@ define(
          * @param {DomainObject} domainObject the Activity
          */
         function ActivityTimespanCapability($q, domainObject) {
+
+            var parent = domainObject.getCapability('context').parentObject;
+
             // Promise time span
             function promiseTimeSpan() {
                 return $q.when(new ActivityTimespan(
                     domainObject.getModel(),
-                    domainObject.getCapability('mutation')
+                    domainObject.getCapability('mutation'),
+                    parent
                 ));
             }
 

platform/features/timeline/src/controllers/TimelineController.js

@@ -36,11 +36,12 @@ define(
          * Controller for the Timeline view.
          * @constructor
          */
-        function TimelineController($scope, $q, objectLoader, MINIMUM_DURATION) {
+        function TimelineController($scope, $q, objectLoader, MINIMUM_DURATION, openmct) {
             var swimlanePopulator = new TimelineSwimlanePopulator(
                     objectLoader,
                     $scope.configuration || {},
-                    $scope.selection
+                    $scope.selection,
+                    openmct
                 ),
                 graphPopulator = new TimelineGraphPopulator($q),
                 dragPopulator = new TimelineDragPopulator(objectLoader);

platform/features/timeline/src/controllers/drag/TimelineDragHandleFactory.js

@@ -51,7 +51,6 @@ define(
                 handles: function (domainObject) {
                     var type = domainObject.getCapability('type'),
                         id = domainObject.getId();
-
                     // Instantiate a handle
                     function instantiate(Handle) {
                         return new Handle(

platform/features/timeline/src/controllers/drag/TimelineDragHandler.js

@@ -115,11 +115,13 @@ define(
                     var timespan = timespans[toId(id)];
                     // Use as setter if argument is present
                     if ((typeof value === 'number') && timespan) {
-                        // Set the start (ensuring that it's non-negative,
+                        // Set the start and duration(ensuring that it's non-negative,
                         // and not after the end time.)
                         timespan.setStart(
                             Math.min(Math.max(value, 0), timespan.getEnd())
                         );
+                        timespan.setDuration(timespan.getEnd() - Math.min(Math.max(value, 0)));
+
                         // Mark as dirty for subsequent persistence
                         dirty[toId(id)] = true;
                     }
@@ -140,10 +142,12 @@ define(
                     var timespan = timespans[toId(id)];
                     // Use as setter if argument is present
                     if ((typeof value === 'number') && timespan) {
-                        // Set the end (ensuring it doesn't precede start)
+                        // Set the end and duration (ensuring it doesn't precede start)
                         timespan.setEnd(
                             Math.max(value, timespan.getStart())
                         );
+                        timespan.setDuration(Math.max(value, timespan.getStart()) - timespan.getStart());
+
                         // Mark as dirty for subsequent persistence
                         dirty[toId(id)] = true;
                     }
@@ -198,9 +202,12 @@ define(
                             // own adjustments
                             start = timespan.getStart();
                             end = timespan.getEnd();
-                            // Update start, then end
+
+                            // Update duration, start, then end
+                            timespan.setDuration(end - start);
                             timespan.setStart(start + delta);
                             timespan.setEnd(end + delta);
+
                             // Mark as dirty for subsequent persistence
                             dirty[toId(spanId)] = true;
                         }

platform/features/timeline/src/controllers/drag/TimelineMoveHandle.js

@@ -68,7 +68,6 @@ define(
                     chooseEnd = diffEnd > 0;
                 }
                 // Start is chosen if diffEnd didn't snap, or nothing snapped
-
                 // Our delta is relative to our initial state, but
                 // dragHandler.move is relative to current state, so whichever
                 // end we're snapping to, we need to compute a delta

platform/features/timeline/src/controllers/swimlane/TimelineSwimlane.js

@@ -39,7 +39,7 @@ define(
          * @param configuration the view's configuration object
          * @param {TimelineSwimlane} parent the parent swim lane (if any)
          */
-        function TimelineSwimlane(domainObject, assigner, configuration, parent, index) {
+        function TimelineSwimlane(domainObject, assigner, configuration, parent, index, openmct) {
             var id = domainObject.getId(),
                 highlight = false, // Drop highlight (middle)
                 highlightBottom = false, // Drop highlight (lower)
@@ -47,13 +47,93 @@ define(
                 depth = parent ? (parent.depth + 1) : 0,
                 timespan,
                 path = (!parent || !parent.parent) ? "" : parent.path +
-                        parent.domainObject.getModel().name + " > ";
+                        parent.domainObject.getModel().name + " > ",
+                instantiate = openmct.$injector.get("instantiate"),
+                copy = 1;
 
             // Look up timespan for this object
             domainObject.useCapability('timespan').then(function (t) {
                 timespan = t;
             });
 
+            function makeCopies(input) {
+                if (input !== undefined) {
+                    var number = Number(input);
+
+                    if (!isNaN(number)) {
+
+                        if (number >= 1 && number <= 5) {
+                            var parentComposition = timespan.getParent().getCapability('composition'),
+                                timespanModel = timespan.getModel();
+
+                            for (var i = 1; i <= number; i++) {
+                                var activityId = timespanModel.id + '-copy-' + copy,
+                                    activityModel = {
+                                        name: timespanModel.name + ' Copy ' + copy,
+                                        start: {timestamp: timespan.getStart(), epoch: "SET"},
+                                        duration: {timestamp: timespan.getDuration(), epoch: "SET"},
+                                        type: 'activity',
+                                        relationships: timespanModel.relationships,
+                                        id: activityId
+                                    },
+                                    activityInstance = instantiate(activityModel);
+
+                                activityInstance.getCapability('location').setPrimaryLocation(timespan.getParent().model.id);
+
+                                parentComposition.add(activityInstance);
+                                copy++;
+                            }
+                        } else {
+                            window.alert("Please enter a Number between 1 and 5");
+                        }
+                    } else {
+                        window.alert("Please enter a Number");
+                    }
+                }
+            }
+
+            function fragment(input) {
+
+                if (input !== undefined) {
+                    var number = Number(input),
+                        frag = 1;
+
+                    if (!isNaN(number)) {
+
+                        if (number >= 2 && number <= 5) {
+                            var parentComposition = timespan.getParent().getCapability('composition'),
+                                timespanModel = timespan.getModel(),
+                                duration = (timespan.getEnd() - timespan.getStart()) / number;
+
+                            timespan.setDuration(duration);
+                            timespan.setEnd(timespan.getStart() + duration);
+
+                            for (var i = 1; i < number; i++) {
+                                var activityId = timespanModel.id + '-fragment-' + frag,
+                                    activityModel = {
+                                        name: timespanModel.name + ' Fragment ' + frag,
+                                        start: {timestamp: timespan.getStart(), epoch: "SET"},
+                                        duration: {timestamp: duration, epoch: "SET"},
+                                        type: 'activity',
+                                        relationships: timespanModel.relationships,
+                                        id: activityId
+                                    },
+                                    activityInstance = instantiate(activityModel);
+
+                                activityInstance.getCapability('location').setPrimaryLocation(timespan.getParent().model.id);
+
+                                parentComposition.add(activityInstance);
+                                frag++;
+                            }
+                        } else {
+                            window.alert("Please enter a Number between 2 and 5");
+                        }
+                    } else {
+                        window.alert("Please enter a Number");
+                    }
+                }
+            }
+
             return {
                 /**
                  * Check if this swimlane is currently visible. (That is,
@@ -155,6 +235,15 @@ define(
                 timespan: function () {
                     return timespan;
                 },
+                updateDuration: function () {
+                    var duration = timespan.getDuration('model'),
+                        start = timespan.getStart();
+
+                    timespan.setDuration(duration);
+                    timespan.setEnd(start + duration);
+                },
+                makeCopies: makeCopies,
+                fragment: fragment,
                 // Expose domain object, expansion state, indentation depth
                 domainObject: domainObject,
                 expanded: true,

platform/features/timeline/src/controllers/swimlane/TimelineSwimlanePopulator.js

@@ -39,7 +39,7 @@ define(
          * timeline view.
          * @constructor
          */
-        function TimelineSwimlanePopulator(objectLoader, configuration, selection) {
+        function TimelineSwimlanePopulator(objectLoader, configuration, selection, openmct) {
             var swimlanes = [],
                 start = Number.POSITIVE_INFINITY,
                 end = Number.NEGATIVE_INFINITY,
@@ -72,7 +72,8 @@ define(
                         assigner,
                         configuration,
                         parent,
-                        index || 0
+                        index || 0,
+                        openmct
                     ), selection);
                     // Track start & end times of this domain object
                     domainObject.useCapability('timespan').then(trackStartEnd);

src/adapter/bundle.js

@@ -31,7 +31,8 @@ define([
     './policies/AdapterCompositionPolicy',
     './policies/AdaptedViewPolicy',
     './runs/AlternateCompositionInitializer',
-    './runs/TimeSettingsURLHandler'
+    './runs/TimeSettingsURLHandler',
+    './runs/TypeDeprecationChecker'
 ], function (
     legacyRegistry,
     ActionDialogDecorator,
@@ -43,7 +44,8 @@ define([
     AdapterCompositionPolicy,
     AdaptedViewPolicy,
     AlternateCompositionInitializer,
-    TimeSettingsURLHandler
+    TimeSettingsURLHandler,
+    TypeDeprecationChecker
 ) {
     legacyRegistry.register('src/adapter', {
         "extensions": {
@@ -107,6 +109,10 @@ define([
                 }
             ],
             runs: [
+                {
+                    implementation: TypeDeprecationChecker,
+                    depends: ["types[]"]
+                },
                 {
                     implementation: AlternateCompositionInitializer,
                     depends: ["openmct"]

src/adapter/runs/TypeDeprecationChecker.js

@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Open openmct, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open openmct 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 openmct 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.
+ *****************************************************************************/
+
+/* global console */
+define([
+
+], function (
+
+) {
+
+    function checkForDeprecatedFunctionality(typeDef) {
+        if (typeDef.hasOwnProperty('telemetry')) {
+            console.warn(
+                'DEPRECATION WARNING: Telemetry data on type ' +
+                'registrations will be deprecated in a future version, ' +
+                'please convert to a custom telemetry metadata provider ' +
+                'for type: ' + typeDef.key
+            );
+        }
+    }
+
+    function TypeDeprecationChecker(types) {
+        types.forEach(checkForDeprecatedFunctionality);
+    }
+
+    return TypeDeprecationChecker;
+
+});

src/api/composition/CompositionAPISpec.js

@@ -0,0 +1,269 @@
+define([
+    './CompositionAPI',
+    './CompositionCollection'
+], function (
+    CompositionAPI,
+    CompositionCollection
+) {
+
+    describe('The Composition API', function () {
+        var publicAPI;
+        var compositionAPI;
+        var topicService;
+        var mutationTopic;
+
+        beforeEach(function () {
+
+            mutationTopic = jasmine.createSpyObj('mutationTopic', [
+                'listen'
+            ]);
+            topicService = jasmine.createSpy('topicService');
+            topicService.andReturn(mutationTopic);
+            publicAPI = {};
+            publicAPI.objects = jasmine.createSpyObj('ObjectAPI', [
+                'get'
+            ]);
+            publicAPI.objects.get.andCallFake(function (identifier) {
+                return Promise.resolve({identifier: identifier});
+            });
+            publicAPI.$injector = jasmine.createSpyObj('$injector', [
+                'get'
+            ]);
+            publicAPI.$injector.get.andReturn(topicService);
+            compositionAPI = new CompositionAPI(publicAPI);
+        });
+
+        it('returns falsy if an object does not support composition', function () {
+            expect(compositionAPI.get({})).toBeFalsy();
+        });
+
+        describe('default composition', function () {
+            var domainObject;
+            var composition;
+
+            beforeEach(function () {
+                domainObject = {
+                    name: 'test folder',
+                    identifier: {
+                        namespace: 'test',
+                        key: '1'
+                    },
+                    composition: [
+                        {
+                            namespace: 'test',
+                            key: 'a'
+                        }
+                    ]
+                };
+                composition = compositionAPI.get(domainObject);
+            });
+
+            it('returns composition collection', function () {
+                expect(composition).toBeDefined();
+                expect(composition).toEqual(jasmine.any(CompositionCollection));
+            });
+
+            it('loads composition from domain object', function () {
+                var listener = jasmine.createSpy('addListener');
+                var loaded = false;
+                composition.on('add', listener);
+                composition.load()
+                    .then(function () {
+                        loaded = true;
+                    });
+                waitsFor(function () {
+                    return loaded;
+                });
+                runs(function () {
+                    expect(listener.calls.length).toBe(1);
+                    expect(listener).toHaveBeenCalledWith({
+                        identifier: {namespace: 'test', key: 'a'}
+                    });
+                });
+            });
+
+            // TODO: Implement add/removal in new default provider.
+            xit('synchronizes changes between instances', function () {
+                var otherComposition = compositionAPI.get(domainObject);
+                var addListener = jasmine.createSpy('addListener');
+                var removeListener = jasmine.createSpy('removeListener');
+                var otherAddListener = jasmine.createSpy('otherAddListener');
+                var otherRemoveListener = jasmine.createSpy('otherRemoveListener');
+                composition.on('add', addListener);
+                composition.on('remove', removeListener);
+                otherComposition.on('add', otherAddListener);
+                otherComposition.on('remove', otherRemoveListener);
+                var loaded = false;
+                Promise.all([composition.load(), otherComposition.load()])
+                    .then(function () {
+                        loaded = true;
+                    });
+                waitsFor(function () {
+                    return loaded;
+                });
+                runs(function () {
+                    expect(addListener).toHaveBeenCalled();
+                    expect(otherAddListener).toHaveBeenCalled();
+                    expect(removeListener).not.toHaveBeenCalled();
+                    expect(otherRemoveListener).not.toHaveBeenCalled();
+
+                    var object = addListener.mostRecentCall.args[0];
+                    composition.remove(object);
+                    expect(removeListener).toHaveBeenCalled();
+                    expect(otherRemoveListener).toHaveBeenCalled();
+
+                    addListener.reset();
+                    otherAddListener.reset();
+                    composition.add(object);
+                    expect(addListener).toHaveBeenCalled();
+                    expect(otherAddListener).toHaveBeenCalled();
+
+                    removeListener.reset();
+                    otherRemoveListener.reset();
+                    otherComposition.remove(object);
+                    expect(removeListener).toHaveBeenCalled();
+                    expect(otherRemoveListener).toHaveBeenCalled();
+
+                    addListener.reset();
+                    otherAddListener.reset();
+                    otherComposition.add(object);
+                    expect(addListener).toHaveBeenCalled();
+                    expect(otherAddListener).toHaveBeenCalled();
+                });
+            });
+        });
+
+        describe('static custom composition', function () {
+            var customProvider;
+            var domainObject;
+            var composition;
+
+            beforeEach(function () {
+                // A simple custom provider, returns the same composition for
+                // all objects of a given type.
+                customProvider = {
+                    appliesTo: function (object) {
+                        return object.type === 'custom-object-type';
+                    },
+                    load: function (object) {
+                        return Promise.resolve([
+                            {
+                                namespace: 'custom',
+                                key: 'thing'
+                            }
+                        ]);
+                    }
+                };
+                domainObject = {
+                    identifier: {
+                        namespace: 'test',
+                        key: '1'
+                    },
+                    type: 'custom-object-type'
+                };
+                compositionAPI.addProvider(customProvider);
+                composition = compositionAPI.get(domainObject);
+            });
+
+            it('supports listening and loading', function () {
+                var listener = jasmine.createSpy('addListener');
+                var loaded = false;
+                composition.on('add', listener);
+                composition.load()
+                    .then(function () {
+                        loaded = true;
+                    });
+                waitsFor(function () {
+                    return loaded;
+                });
+                runs(function () {
+                    expect(listener.calls.length).toBe(1);
+                    expect(listener).toHaveBeenCalledWith({
+                        identifier: {namespace: 'custom', key: 'thing'}
+                    });
+                });
+            });
+        });
+
+        describe('dynamic custom composition', function () {
+            var customProvider;
+            var domainObject;
+            var composition;
+
+            beforeEach(function () {
+                // A dynamic provider, loads an empty composition and exposes
+                // listener functions.
+                customProvider = jasmine.createSpyObj('dynamicProvider', [
+                    'appliesTo',
+                    'load',
+                    'on',
+                    'off'
+                ]);
+
+                customProvider.appliesTo.andReturn('true');
+                customProvider.load.andReturn(Promise.resolve([]));
+
+                domainObject = {
+                    identifier: {
+                        namespace: 'test',
+                        key: '1'
+                    },
+                    type: 'custom-object-type'
+                };
+                compositionAPI.addProvider(customProvider);
+                composition = compositionAPI.get(domainObject);
+            });
+
+            it('supports listening and loading', function () {
+                var addListener = jasmine.createSpy('addListener');
+                var removeListener = jasmine.createSpy('removeListener');
+                var loaded = false;
+                composition.on('add', addListener);
+                composition.on('remove', removeListener);
+                expect(customProvider.on).toHaveBeenCalledWith(
+                    domainObject,
+                    'add',
+                    jasmine.any(Function),
+                    jasmine.any(CompositionCollection)
+                );
+                expect(customProvider.on).toHaveBeenCalledWith(
+                    domainObject,
+                    'remove',
+                    jasmine.any(Function),
+                    jasmine.any(CompositionCollection)
+                );
+                var add = customProvider.on.calls[0].args[2];
+                var remove = customProvider.on.calls[1].args[2];
+                composition.load()
+                    .then(function () {
+                        loaded = true;
+                    });
+                waitsFor(function () {
+                    return loaded;
+                });
+                runs(function () {
+                    expect(addListener).not.toHaveBeenCalled();
+                    expect(removeListener).not.toHaveBeenCalled();
+                    add({namespace: 'custom', key: 'thing'});
+                });
+                waitsFor(function () {
+                    return addListener.calls.length > 0;
+                });
+                runs(function () {
+                    expect(addListener).toHaveBeenCalledWith({
+                        identifier: {namespace: 'custom', key: 'thing'}
+                    });
+                    remove(addListener.mostRecentCall.args[0]);
+                });
+                waitsFor(function () {
+                    return removeListener.calls.length > 0;
+                });
+                runs(function () {
+                    expect(removeListener).toHaveBeenCalledWith({
+                        identifier: {namespace: 'custom', key: 'thing'}
+                    });
+                });
+            });
+        });
+    });
+});

src/api/telemetry/DefaultMetadataProvider.js

@@ -0,0 +1,128 @@
+/*****************************************************************************
+ * Open openmct, Copyright (c) 2014-2018, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open openmct 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 openmct 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 (
+    _
+) {
+
+    /**
+     * This is the default metadata provider; for any object with a "telemetry"
+     * property, this provider will return the value of that property as the
+     * telemetry metadata.
+     *
+     * This provider also implements legacy support for telemetry metadata
+     * defined on the type.  Telemetry metadata definitions on type will be
+     * depreciated in the future.
+     */
+    function DefaultMetadataProvider(openmct) {
+        this.openmct = openmct;
+    }
+
+    /**
+     * Applies to any domain object with a telemetry property, or whose type
+     * definition has a telemetry property.
+     */
+    DefaultMetadataProvider.prototype.supportsMetadata = function (domainObject) {
+        return !!domainObject.telemetry || !!this.typeHasTelemetry(domainObject);
+    };
+
+    /**
+     * Retrieves valueMetadata from legacy metadata.
+     * @private
+     */
+    function valueMetadatasFromOldFormat(metadata) {
+        var valueMetadatas = [];
+
+        valueMetadatas.push({
+            key: 'name',
+            name: 'Name'
+        });
+
+        metadata.domains.forEach(function (domain, index) {
+            var valueMetadata = _.clone(domain);
+            valueMetadata.hints = {
+                domain: index + 1
+            };
+            valueMetadatas.push(valueMetadata);
+        });
+
+        metadata.ranges.forEach(function (range, index) {
+            var valueMetadata = _.clone(range);
+            valueMetadata.hints = {
+                range: index,
+                priority: index + metadata.domains.length + 1
+            };
+
+            if (valueMetadata.type === 'enum') {
+                valueMetadata.key = 'enum';
+                valueMetadata.hints.y -= 10;
+                valueMetadata.hints.range -= 10;
+                valueMetadata.enumerations =
+                    _.sortBy(valueMetadata.enumerations.map(function (e) {
+                        return {
+                            string: e.string,
+                            value: +e.value
+                        };
+                    }), 'e.value');
+                valueMetadata.values = _.pluck(valueMetadata.enumerations, 'value');
+                valueMetadata.max = _.max(valueMetadata.values);
+                valueMetadata.min = _.min(valueMetadata.values);
+            }
+
+            valueMetadatas.push(valueMetadata);
+        });
+
+        return valueMetadatas;
+    }
+
+    /**
+     * Returns telemetry metadata for a given domain object.
+     */
+    DefaultMetadataProvider.prototype.getMetadata = function (domainObject) {
+        var metadata = domainObject.telemetry || {};
+        if (this.typeHasTelemetry(domainObject)) {
+            var typeMetadata = this.typeService.getType(domainObject.type).typeDef.telemetry;
+            _.extend(metadata, typeMetadata);
+            if (!metadata.values) {
+                metadata.values = valueMetadatasFromOldFormat(metadata);
+            }
+        }
+
+        return metadata;
+    };
+
+    /**
+     * @private
+     */
+    DefaultMetadataProvider.prototype.typeHasTelemetry = function (domainObject) {
+        if (!this.typeService) {
+            this.typeService = this.openmct.$injector.get('typeService');
+        }
+        return !!this.typeService.getType(domainObject.type).typeDef.telemetry;
+    };
+
+
+    return DefaultMetadataProvider;
+
+});

src/api/telemetry/LegacyTelemetryProvider.js

@@ -141,17 +141,20 @@ define([
         return capability.subscribe(callbackWrapper, request);
     };
 
-    LegacyTelemetryProvider.prototype.limitEvaluator = function (domainObject) {
+    LegacyTelemetryProvider.prototype.supportsLimits = function (domainObject) {
         var oldObject = this.instantiate(
             utils.toOldFormat(domainObject),
-            utils.makeKeyString(domainObject.identifier));
-        var limitEvaluator = oldObject.getCapability("limit");
+            utils.makeKeyString(domainObject.identifier)
+        );
+        return oldObject.hasCapability("limit");
+    };
 
-        if (!limitEvaluator) {
-            return {
-                evaluate: function () {}
-            };
-        }
+    LegacyTelemetryProvider.prototype.getLimitEvaluator = function (domainObject) {
+        var oldObject = this.instantiate(
+            utils.toOldFormat(domainObject),
+            utils.makeKeyString(domainObject.identifier)
+        );
+        var limitEvaluator = oldObject.getCapability("limit");
 
         return {
             evaluate: function (datum, property) {
@@ -166,6 +169,7 @@ define([
         openmct.telemetry.legacyProvider = provider;
         openmct.telemetry.requestProviders.push(provider);
         openmct.telemetry.subscriptionProviders.push(provider);
+        openmct.telemetry.limitProviders.push(provider);
     };
 
 });

src/api/telemetry/TelemetryAPI.js

@@ -3,7 +3,7 @@
  * 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
+ * Open openmct 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.
@@ -14,20 +14,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  *
- * Open MCT includes source code licensed under additional open source
+ * Open openmct 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.
  *****************************************************************************/
-
+/*global console*/
 define([
     './TelemetryMetadataManager',
     './TelemetryValueFormatter',
+    './DefaultMetadataProvider',
     '../objects/object-utils',
     'lodash'
 ], function (
     TelemetryMetadataManager,
     TelemetryValueFormatter,
+    DefaultMetadataProvider,
     objectUtils,
     _
 ) {
@@ -122,7 +124,6 @@ define([
      */
 
 
-
     /**
      * An interface for retrieving telemetry data associated with a domain
      * object.
@@ -131,15 +132,29 @@ define([
      * @augments module:openmct.TelemetryAPI~TelemetryProvider
      * @memberof module:openmct
      */
-    function TelemetryAPI(MCT) {
-        this.MCT = MCT;
+    function TelemetryAPI(openmct) {
+        this.openmct = openmct;
         this.requestProviders = [];
         this.subscriptionProviders = [];
+        this.metadataProviders = [new DefaultMetadataProvider(this.openmct)];
+        this.limitProviders = [];
         this.metadataCache = new WeakMap();
         this.formatMapCache = new WeakMap();
         this.valueFormatterCache = new WeakMap();
     }
 
+    /**
+     * Return true if the given domainObject is a telemetry object.  A telemetry
+     * object is any object which has telemetry metadata-- regardless of whether
+     * the telemetry object has an available telemetry provider.
+     *
+     * @param {module:openmct.DomainObject} domainObject
+     * @returns {boolean} true if the object is a telemetry object.
+     */
+    TelemetryAPI.prototype.isTelemetryObject = function (domainObject) {
+        return !!this.findMetadataProvider(domainObject);
+    };
+
     /**
      * Check if this provider can supply telemetry data associated with
      * this domain object.
@@ -151,6 +166,11 @@ define([
      * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
      */
     TelemetryAPI.prototype.canProvideTelemetry = function (domainObject) {
+        console.warn(
+            'DEPRECATION WARNING: openmct.telemetry.canProvideTelemetry ' +
+            'will not be supported in future versions of Open MCT.  Please ' +
+            'use openmct.telemetry.isTelemetryObject instead.'
+        );
         return !!this.findSubscriptionProvider(domainObject) ||
                !!this.findRequestProvider(domainObject);
     };
@@ -170,6 +190,12 @@ define([
         if (provider.supportsSubscribe) {
             this.subscriptionProviders.unshift(provider);
         }
+        if (provider.supportsMetadata) {
+            this.metadataProviders.unshift(provider);
+        }
+        if (provider.supportsLimits) {
+            this.limitProviders.unshift(provider);
+        }
     };
 
     /**
@@ -196,18 +222,36 @@ define([
         return this.requestProviders.filter(supportsDomainObject)[0];
     };
 
+    /**
+     * @private
+     */
+    TelemetryAPI.prototype.findMetadataProvider = function (domainObject) {
+        return this.metadataProviders.filter(function (p) {
+            return p.supportsMetadata(domainObject);
+        })[0];
+    };
+
+    /**
+     * @private
+     */
+    TelemetryAPI.prototype.findLimitEvaluator = function (domainObject) {
+        return this.limitProviders.filter(function (p) {
+            return p.supportsLimits(domainObject);
+        })[0];
+    };
+
     /**
      * @private
      */
     TelemetryAPI.prototype.standardizeRequestOptions = function (options) {
         if (!options.hasOwnProperty('start')) {
-            options.start = this.MCT.time.bounds().start;
+            options.start = this.openmct.time.bounds().start;
         }
         if (!options.hasOwnProperty('end')) {
-            options.end = this.MCT.time.bounds().end;
+            options.end = this.openmct.time.bounds().end;
         }
         if (!options.hasOwnProperty('domain')) {
-            options.domain = this.MCT.time.timeSystem().key;
+            options.domain = this.openmct.time.timeSystem().key;
         }
     };
 
@@ -300,12 +344,15 @@ define([
      */
     TelemetryAPI.prototype.getMetadata = function (domainObject) {
         if (!this.metadataCache.has(domainObject)) {
-            if (!this.typeService) {
-                this.typeService = this.MCT.$injector.get('typeService');
+            var metadataProvider = this.findMetadataProvider(domainObject);
+            if (!metadataProvider) {
+                return;
             }
+            var metadata = metadataProvider.getMetadata(domainObject);
+
             this.metadataCache.set(
                 domainObject,
-                new TelemetryMetadataManager(domainObject, this.typeService)
+                new TelemetryMetadataManager(metadata)
             );
         }
         return this.metadataCache.get(domainObject);
@@ -343,7 +390,7 @@ define([
     TelemetryAPI.prototype.getValueFormatter = function (valueMetadata) {
         if (!this.valueFormatterCache.has(valueMetadata)) {
             if (!this.formatService) {
-                this.formatService = this.MCT.$injector.get('formatService');
+                this.formatService = this.openmct.$injector.get('formatService');
             }
             this.valueFormatterCache.set(
                 valueMetadata,
@@ -375,7 +422,7 @@ define([
      * @param {Format} format the
      */
     TelemetryAPI.prototype.addFormat = function (format) {
-        this.MCT.legacyExtension('formats', {
+        this.openmct.legacyExtension('formats', {
             key: format.key,
             implementation: function () {
                 return format;
@@ -385,7 +432,9 @@ define([
 
     /**
      * Get a limit evaluator for this domain object.
-     * Limit Evaluators help you evaluate limit and alarm status of individual telemetry datums for display purposes without having to interact directly with the Limit API.
+     * Limit Evaluators help you evaluate limit and alarm status of individual
+     * telemetry datums for display purposes without having to interact directly
+     * with the Limit API.
      *
      * This method is optional.
      * If a provider does not implement this method, it is presumed
@@ -397,8 +446,34 @@ define([
      * @method limitEvaluator
      * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
      */
-    TelemetryAPI.prototype.limitEvaluator = function () {
-        return this.legacyProvider.limitEvaluator.apply(this.legacyProvider, arguments);
+    TelemetryAPI.prototype.limitEvaluator = function (domainObject) {
+        return this.getLimitEvaluator(domainObject);
+    };
+
+    /**
+     * Get a limit evaluator for this domain object.
+     * Limit Evaluators help you evaluate limit and alarm status of individual
+     * telemetry datums for display purposes without having to interact directly
+     * with the Limit API.
+     *
+     * This method is optional.
+     * If a provider does not implement this method, it is presumed
+     * that no limits are defined for this domain object's telemetry.
+     *
+     * @param {module:openmct.DomainObject} domainObject the domain
+     *        object for which to evaluate limits
+     * @returns {module:openmct.TelemetryAPI~LimitEvaluator}
+     * @method limitEvaluator
+     * @memberof module:openmct.TelemetryAPI~TelemetryProvider#
+     */
+    TelemetryAPI.prototype.getLimitEvaluator = function (domainObject) {
+        var provider = this.findLimitEvaluator(domainObject);
+        if (!provider) {
+            return {
+                evaluate: function () {}
+            };
+        }
+        return provider.getLimitEvaluator(domainObject);
     };
 
     return TelemetryAPI;

src/api/telemetry/TelemetryAPISpec.js

@@ -1,3 +1,25 @@
+/*****************************************************************************
+ * 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([
     './TelemetryAPI'
 ], function (

src/api/telemetry/TelemetryMetadataManager.js

@@ -27,51 +27,6 @@ define([
     _
 ) {
 
-    function valueMetadatasFromOldFormat(metadata) {
-        var valueMetadatas = [];
-
-        valueMetadatas.push({
-            key: 'name',
-            name: 'Name'
-        });
-
-        metadata.domains.forEach(function (domain, index) {
-            var valueMetadata = _.clone(domain);
-            valueMetadata.hints = {
-                domain: index + 1
-            };
-            valueMetadatas.push(valueMetadata);
-        });
-
-        metadata.ranges.forEach(function (range, index) {
-            var valueMetadata = _.clone(range);
-            valueMetadata.hints = {
-                range: index,
-                priority: index + metadata.domains.length + 1
-            };
-
-            if (valueMetadata.type === 'enum') {
-                valueMetadata.key = 'enum';
-                valueMetadata.hints.y -= 10;
-                valueMetadata.hints.range -= 10;
-                valueMetadata.enumerations =
-                    _.sortBy(valueMetadata.enumerations.map(function (e) {
-                        return {
-                            string: e.string,
-                            value: +e.value
-                        };
-                    }), 'e.value');
-                valueMetadata.values = _.pluck(valueMetadata.enumerations, 'value');
-                valueMetadata.max = _.max(valueMetadata.values);
-                valueMetadata.min = _.min(valueMetadata.values);
-            }
-
-            valueMetadatas.push(valueMetadata);
-        });
-
-        return valueMetadatas;
-    }
-
     function applyReasonableDefaults(valueMetadata, index) {
         valueMetadata.source = valueMetadata.source || valueMetadata.key;
         valueMetadata.hints = valueMetadata.hints || {};
@@ -119,24 +74,14 @@ define([
     }
 
     /**
-     * Utility class for handling telemetry metadata for a domain object.
-     * Wraps old format metadata to new format metadata.
-     * Provides methods for interrogating telemetry metadata.
+     * Utility class for handling and inspecting telemetry metadata.  Applies
+     * reasonable defaults to simplify the task of providing metadata, while
+     * also providing methods for interrogating telemetry metadata.
      */
-    function TelemetryMetadataManager(domainObject, typeService) {
-        this.metadata = domainObject.telemetry || {};
+    function TelemetryMetadataManager(metadata) {
+        this.metadata = metadata;
 
-        if (this.metadata.values) {
-            this.valueMetadatas = this.metadata.values;
-        } else {
-            var typeMetadata = typeService
-                .getType(domainObject.type).typeDef.telemetry;
-
-            _.extend(this.metadata, typeMetadata);
-            this.valueMetadatas = valueMetadatasFromOldFormat(this.metadata);
-        }
-
-        this.valueMetadatas = this.valueMetadatas.map(applyReasonableDefaults);
+        this.valueMetadatas = this.metadata.values.map(applyReasonableDefaults);
     }
 
     /**

src/api/types/TypeRegistry.js

@@ -90,7 +90,7 @@ define(['./Type'], function (Type) {
     /**
      * Retrieve a registered type by its key.
      * @method get
-     * @param {string} typeKey the key for htis type
+     * @param {string} typeKey the key for this type
      * @memberof module:openmct.TypeRegistry#
      * @returns {module:openmct.Type} the registered type
      */

src/api/types/TypeRegistrySpec.js

@@ -0,0 +1,55 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2017, 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(['./TypeRegistry', './Type'], function (TypeRegistry, Type) {
+    describe('The Type API', function () {
+        var typeRegistryInstance;
+
+        beforeEach(function () {
+            typeRegistryInstance = new TypeRegistry ();
+            typeRegistryInstance.addType('testType', {
+                name: 'Test Type',
+                description: 'This is a test type.',
+                creatable: true
+            });
+        });
+
+        it('types can be standardized', function () {
+            typeRegistryInstance.addType('standardizationTestType', {
+                label: 'Test Type',
+                description: 'This is a test type.',
+                creatable: true
+            });
+            typeRegistryInstance.standardizeType(typeRegistryInstance.types.standardizationTestType);
+            expect(typeRegistryInstance.get('standardizationTestType').definition.label).toBeUndefined();
+            expect(typeRegistryInstance.get('standardizationTestType').definition.name).toBe('Test Type');
+        });
+
+        it('new types are registered successfully and can be retrieved', function () {
+            expect(typeRegistryInstance.get('testType').definition.name).toBe('Test Type');
+        });
+
+        it('type registry contains new keys', function () {
+            expect(typeRegistryInstance.listKeys ()).toContain('testType');
+        });
+    });
+});

src/defaultRegistry.js

@@ -38,7 +38,6 @@ define([
     '../example/msl/bundle',
     '../example/notifications/bundle',
     '../example/persistence/bundle',
-    '../example/plotOptions/bundle',
     '../example/policy/bundle',
     '../example/profiling/bundle',
     '../example/scratchpad/bundle',

src/plugins/activityModes/plugin.js

@@ -0,0 +1,31 @@
+define([
+    './src/actions/activityModesImportAction',
+    './src/policies/ActionPolicy'
+],
+function (ActivityModes, ActionPolicy) {
+    function plugin() {
+
+        return function install(openmct) {
+
+            openmct.legacyExtension('actions', {
+                key: "import-csv",
+                category: ["contextual"],
+                implementation: ActivityModes,
+                cssClass: "major icon-import",
+                name: "Import Activity Definitions from CSV",
+                description: "Import activities from a CSV file",
+                depends: [
+                    "dialogService",
+                    "openmct"
+                ]
+            });
+
+            openmct.legacyExtension('policies', {
+                category: 'action',
+                implementation: ActionPolicy
+            });
+        };
+    }
+
+    return plugin;
+});

src/plugins/activityModes/src/actions/activityModesImportAction.js

@@ -0,0 +1,172 @@
+define(['d3-dsv'], function (d3Dsv) {
+
+    function ActivityModesImportAction(dialogService, openmct, context) {
+        this.dialogService = dialogService;
+        this.openmct = openmct;
+        this.context = context;
+        this.parent = this.context.domainObject;
+        this.instantiate = this.openmct.$injector.get("instantiate");
+        this.objectService = this.openmct.$injector.get("objectService").objectService;
+        this.populateActivities = this.populateActivities.bind(this);
+    }
+
+    ActivityModesImportAction.prototype.perform = function () {
+        this.parentId = this.parent.getId();
+
+        this.dialogService.getUserInput(this.getFormModel(), function () {})
+        .then(function (form) {
+            if (form.selectFile.name.slice(-3) !== 'csv') {
+                this.displayError();
+            }
+
+            this.csvParse(form.selectFile.body).then(this.populateActivities);
+        }.bind(this));
+    };
+
+    ActivityModesImportAction.prototype.csvParse = function (csvString) {
+        return new Promise(function (resolve, reject) {
+            var parsedObject = d3Dsv.csvParse(csvString);
+
+            return parsedObject ? resolve(parsedObject) : reject('Could not parse provided file');
+        });
+    };
+
+    ActivityModesImportAction.prototype.populateActivities = function (csvObjects) {
+        this.parentComposition = this.parent.getCapability("composition");
+        this.blockingDialog = this.showBlockingMessage();
+
+        var activitiesObjects = {},
+            activityModesObjects = {};
+
+        csvObjects.forEach(function (activity, index) {
+            var newActivity = {},
+                newActivityMode = {},
+                duration = !isNaN(Number(activity.duration)) ? 1000 * Number(activity.duration) : 0;
+
+            newActivity.name = activity.name;
+            newActivity.id = activity.id ? ('activity-' + activity.id) : ('activity-' + index + '-' + this.parentId);
+            newActivity.start = {timestamp: 0, epoch: "SET"};
+            newActivity.duration = {timestamp: duration, epoch: "SET"};
+            newActivity.type = "activity";
+            newActivity.composition = [];
+            newActivity.relationships = {modes: []};
+
+            newActivityMode.name = activity.name + ' Resources';
+            newActivityMode.id = activity.id ? ('activity-mode-' + activity.id) : ('activity-mode-' + index + '-' + this.parentId);
+            newActivityMode.resources = {comms: Number(activity.comms) || 0, power: Number(activity.power) || 0};
+            newActivityMode.type = 'mode';
+
+            newActivity.relationships.modes.push(newActivityMode.id);
+
+            activitiesObjects[newActivity.id] = newActivity;
+            activityModesObjects[newActivityMode.id] = newActivityMode;
+        }.bind(this));
+
+        this.instantiateActivityModes(activityModesObjects);
+        this.instantiateActivities(activitiesObjects);
+    };
+
+    ActivityModesImportAction.prototype.instantiateActivityModes = function (activityModesObjects) {
+        var activityModesArray = Object.keys(activityModesObjects);
+
+        this.objectService.getObjects(activityModesArray).then(
+            function (previousActivityModes) {
+                activityModesArray.forEach(function (activityModeId) {
+                    previousActivityModes[activityModeId].getCapability('mutation').mutate(function (prev) {
+                        var activityMode = activityModesObjects[activityModeId];
+
+                        prev.name = activityMode.name;
+                        prev.resources = activityMode.resources;
+                        prev.type = activityMode.type;
+                        prev.id = activityMode.id;
+                    });
+                });
+            }
+        );
+    };
+
+    ActivityModesImportAction.prototype.instantiateActivities = function (activitiesObjects) {
+        var activityObjectArray = Object.keys(activitiesObjects);
+
+        this.objectService.getObjects(activityObjectArray).then(
+            function (objects) {
+                activityObjectArray.forEach(function (activityId, index) {
+                    var activity = activitiesObjects[activityId];
+
+                    objects[activityId].getCapability('mutation').mutate(function (prevActivity) {
+                        prevActivity.name = activity.name;
+                        prevActivity.start = activity.start;
+                        prevActivity.duration = activity.duration;
+                        prevActivity.type = activity.type;
+                        prevActivity.composition = activity.composition;
+                        prevActivity.relationships = activity.relationships;
+                        prevActivity.id = activity.id;
+                    });
+
+                    objects[activityId].getCapability('location').setPrimaryLocation(this.parentId);
+
+                    if ((index === (activityObjectArray.length - 1)) && this.blockingDialog) {
+                        this.blockingDialog.dismiss();
+                    }
+                }.bind(this));
+
+                this.parentComposition.domainObject.getCapability('mutation').mutate(function (parentComposition) {
+                    parentComposition.composition = activityObjectArray;
+                });
+            }.bind(this)
+        );
+    };
+
+    ActivityModesImportAction.prototype.showBlockingMessage = function () {
+        var model = {
+            title: "Importing",
+            actionText:  "Importing Activities from CSV",
+            severity: "info",
+            unknownProgress: true
+        };
+
+        return this.dialogService.showBlockingMessage(model);
+    };
+
+    ActivityModesImportAction.prototype.displayError = function () {
+        var dialog,
+        perform = this.perform.bind(this),
+        model = {
+            title: "Invalid File",
+            actionText:  "The selected file was not a valid CSV file",
+            severity: "error",
+            options: [
+                {
+                    label: "Ok",
+                    callback: function () {
+                        dialog.dismiss();
+                        perform();
+                    }
+                }
+            ]
+        };
+        dialog = this.dialogService.showBlockingMessage(model);
+    };
+
+    ActivityModesImportAction.prototype.getFormModel = function () {
+        return {
+            name: 'Import activities from CSV',
+            sections: [
+                {
+                    name: 'Import A File',
+                    rows: [
+                        {
+                            name: 'Select File',
+                            key: 'selectFile',
+                            control: 'file-input',
+                            required: true,
+                            text: 'Select File'
+                        }
+                    ]
+                }
+            ]
+        };
+    };
+
+    return ActivityModesImportAction;
+});

src/plugins/activityModes/src/policies/ActionPolicy.js

@@ -0,0 +1,46 @@
+/*****************************************************************************
+ * 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 () {
+
+        function ActionPolicy() {
+        }
+
+        ActionPolicy.prototype.allow = function (action, context) {
+            var key = action.getMetadata().key,
+                domainObjectType =
+                context.domainObject ? context.domainObject.getModel().type : '';
+
+            if (key === 'import-csv') {
+                if (domainObjectType === 'folder') {
+                    return true;
+                }
+                return false;
+            }
+
+            return true;
+        };
+
+        return ActionPolicy;
+    }
+);

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

@@ -166,11 +166,6 @@
                      ng-show="plotHistory.length"
                      style="position: absolute; top: 8px; right: 8px;">
 
-                    <a class="s-button icon-brackets"
-                        ng-click="plot.syncConductor()"
-                        title="Synchronize Time Conductor to plot bounds">
-                    </a>
-
                     <a class="s-button icon-arrow-left"
                        ng-click="plot.back()"
                        title="Restore previous pan/zoom">

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

@@ -75,7 +75,6 @@ function (
         this.$scope.$watch('highlights', this.scheduleDraw);
         this.$scope.$watch('rectangles', this.scheduleDraw);
         this.config.series.forEach(this.onSeriesAdd, this);
-        window.chart = this;
     }
 
     eventHelpers.extend(MCTChartController.prototype);

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

@@ -85,6 +85,19 @@ define([
 
             this.listenTo(this, 'destroy', this.onDestroy, this);
         },
+        /**
+         * Retrieve the persisted series config for a given identifier.
+         */
+        getPersistedSeriesConfig: function (identifier) {
+            var domainObject = this.get('domainObject');
+            if (!domainObject.configuration || !domainObject.configuration.series) {
+                return;
+            }
+            return domainObject.configuration.series.filter(function (seriesConfig) {
+                return seriesConfig.identifier.key === identifier.key &&
+                    seriesConfig.identifier.namespace === identifier.namespace;
+            })[0];
+        },
         /**
          * Update the domain object with the given value.
          */

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

@@ -165,10 +165,13 @@ define([
                 return;
             }
             var valueMetadata = this.metadata.value(newKey);
-            if (valueMetadata.format === 'enum') {
-                this.set('interpolate', 'stepAfter');
-            } else {
-                this.set('interpolate', 'linear');
+            var persistedConfig = this.get('persistedConfiguration');
+            if (!persistedConfig || !persistedConfig.interpolate) {
+                if (valueMetadata.format === 'enum') {
+                    this.set('interpolate', 'stepAfter');
+                } else {
+                    this.set('interpolate', 'linear');
+                }
             }
             this.evaluate = function (datum) {
                 return this.limitEvaluator.evaluate(datum, valueMetadata);
@@ -233,8 +236,6 @@ define([
          * @returns {Promise}
          */
         load: function (options) {
-            this.resetOnAppend = true;
-
             return this.fetch(options)
                 .then(function (res) {
                     this.emit('load');

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

@@ -41,6 +41,7 @@ define([
             this.palette = new color.ColorPalette();
             this.listenTo(this, 'add', this.onSeriesAdd, this);
             this.listenTo(this, 'remove', this.onSeriesRemove, this);
+            this.listenTo(this.plot, 'change:domainObject', this.trackPersistedConfig, this);
 
             var domainObject = this.plot.get('domainObject');
             if (domainObject.telemetry) {
@@ -49,6 +50,14 @@ define([
                 this.watchTelemetryContainer(domainObject);
             }
         },
+        trackPersistedConfig: function (domainObject) {
+            domainObject.configuration.series.forEach(function (seriesConfig) {
+                var series = this.byIdentifier(seriesConfig.identifier);
+                if (series) {
+                    series.set('persistedConfiguration', seriesConfig);
+                }
+            }, this);
+        },
         watchTelemetryContainer: function (domainObject) {
             var composition = this.openmct.composition.get(domainObject);
             this.listenTo(composition, 'add', this.addTelemetryObject, this);
@@ -75,6 +84,9 @@ define([
                 seriesConfig = JSON.parse(JSON.stringify(seriesConfig));
             }
 
+            seriesConfig.persistedConfiguration =
+                this.plot.getPersistedSeriesConfig(domainObject.identifier);
+
             this.add(new PlotSeries({
                 model: seriesConfig,
                 domainObject: domainObject,
@@ -125,12 +137,19 @@ define([
         },
         updateColorPalette: function (newColor, oldColor) {
             this.palette.remove(newColor);
-            var seriesWithColor = this.series.filter(function (series) {
+            var seriesWithColor = this.filter(function (series) {
                 return series.get('color') === newColor;
             })[0];
             if (!seriesWithColor) {
                 this.palette.return(oldColor);
             }
+        },
+        byIdentifier: function (identifier) {
+            return this.filter(function (series) {
+                var seriesIdentifier = series.get('identifier');
+                return seriesIdentifier.namespace === identifier.namespace &&
+                    seriesIdentifier.key === identifier.key;
+            })[0];
         }
     });
 

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

@@ -48,7 +48,6 @@ define([
 
         this.configId = $scope.domainObject.getId();
         this.setUpScope();
-        window.config = this;
     }
 
     eventHelpers.extend(PlotOptionsController.prototype);

src/plugins/plot/src/plot/MCTPlotController.js

@@ -33,13 +33,12 @@ define([
      * It supports pan and zoom, implements zoom history, and supports locating
      * values near the cursor.
      */
-    function MCTPlotController($scope, $element, $window, openmct) {
+    function MCTPlotController($scope, $element, $window) {
         this.$scope = $scope;
         this.$scope.config = this.config;
         this.$scope.plot = this;
         this.$element = $element;
         this.$window = $window;
-        this.openmct = openmct;
 
         this.xScale = new LinearScale(this.config.xAxis.get('displayRange'));
         this.yScale = new LinearScale(this.config.yAxis.get('displayRange'));
@@ -54,7 +53,6 @@ define([
         this.listenTo(this.$scope, 'plot:clearHistory', this.clear, this);
 
         this.initialize();
-        window.control = this;
     }
 
     MCTPlotController.$inject = ['$scope', '$element', '$window'];
@@ -333,13 +331,6 @@ define([
         this.$scope.$emit('user:viewport:change:end');
     };
 
-
-    MCTPlotController.prototype.syncConductor = function () {
-        var xDisplayRange = this.config.xAxis.get('displayRange');
-        this.openmct.time.stopClock();
-        this.openmct.time.bounds({start: xDisplayRange.min, end: xDisplayRange.max});
-    };
-
     MCTPlotController.prototype.destroy = function () {
         this.stopListening();
     };

src/plugins/plot/src/plot/MCTPlotDirective.js

@@ -33,7 +33,7 @@ define([
         return {
             restrict: "E",
             template: PlotTemplate,
-            controller: ['$scope', '$element', '$window', 'openmct', MCTPlotController],
+            controller: MCTPlotController,
             controllerAs: 'mctPlotController',
             bindToController: {
                 config: "="

src/plugins/plot/src/plot/MCTTicksController.js

@@ -117,12 +117,6 @@ define([
         this.$scope = $scope;
         this.$element = $element;
 
-        if (!window.ticks) {
-            window.ticks = [];
-        }
-
-        window.ticks.push(this);
-
         this.tickCount = 4;
         this.tickUpdate = false;
         this.listenTo(this.axis, 'change:displayRange', this.updateTicks, this);

src/plugins/plot/src/telemetry/PlotController.js

@@ -71,7 +71,6 @@ define([
         this.config.series.forEach(this.addSeries, this);
 
         this.followTimeConductor();
-        window.plot = this;
     }
 
     eventHelpers.extend(PlotController.prototype);
@@ -83,6 +82,10 @@ define([
     };
 
     PlotController.prototype.loadSeriesData = function (series) {
+        if (this.$element[0].offsetWidth === 0) {
+            this.scheduleLoad(series);
+            return;
+        }
         this.startLoading();
         var options = {
             size: this.$element[0].offsetWidth,
@@ -93,6 +96,26 @@ define([
             .then(this.stopLoading.bind(this));
     };
 
+    PlotController.prototype.scheduleLoad = function (series) {
+        if (!this.scheduledLoads) {
+            this.startLoading();
+            this.scheduledLoads = [];
+            this.checkForSize = setInterval(function () {
+                if (this.$element[0].offsetWidth === 0) {
+                    return;
+                }
+                this.stopLoading();
+                this.scheduledLoads.forEach(this.loadSeriesData, this);
+                delete this.scheduledLoads;
+                clearInterval(this.checkForSize);
+                delete this.checkForSize;
+            }.bind(this));
+        }
+        if (this.scheduledLoads.indexOf(series) === -1) {
+            this.scheduledLoads.push(series);
+        }
+    };
+
     PlotController.prototype.addSeries = function (series) {
         this.listenTo(series, 'change:yKey', function () {
             this.loadSeriesData(series);
@@ -127,6 +150,10 @@ define([
     PlotController.prototype.destroy = function () {
         configStore.untrack(this.config.id);
         this.stopListening();
+        if (this.checkForSize) {
+            clearInterval(this.checkForSize);
+            delete this.checkForSize;
+        }
     };
 
     PlotController.prototype.loadMoreData = function (range, purge) {

src/plugins/plugins.js

@@ -30,8 +30,10 @@ define([
     '../../platform/import-export/bundle',
     './summaryWidget/plugin',
     './URLIndicatorPlugin/URLIndicatorPlugin',
+    './activityModes/plugin',
     './telemetryMean/plugin',
-    './plot/plugin'
+    './plot/plugin',
+    './staticRootPlugin/plugin'
 ], function (
     _,
     UTCTimeSystem,
@@ -42,8 +44,10 @@ define([
     ImportExport,
     SummaryWidget,
     URLIndicatorPlugin,
+    ActivityModes,
     TelemetryMean,
-    PlotPlugin
+    PlotPlugin,
+    StaticRootPlugin
 ) {
     var bundleMap = {
         CouchDB: 'platform/persistence/couch',
@@ -66,6 +70,8 @@ define([
 
     plugins.ImportExport = ImportExport;
 
+    plugins.StaticRootPlugin = StaticRootPlugin;
+
     /**
      * A tabular view showing the latest values of multiple telemetry points at
      * once. Formatted so that labels and values are aligned.
@@ -133,6 +139,7 @@ define([
     plugins.SummaryWidget = SummaryWidget;
     plugins.TelemetryMean = TelemetryMean;
     plugins.URLIndicatorPlugin = URLIndicatorPlugin;
+    plugins.ActivityModes = ActivityModes;
 
     return plugins;
 });

src/plugins/staticRootPlugin/StaticModelProvider.js

@@ -0,0 +1,78 @@
+define([
+    '../../api/objects/object-utils'
+], function (
+    objectUtils
+) {
+    /**
+     * Transforms an import json blob into a object map that can be used to
+     * provide objects.  Rewrites root identifier in import data with provided
+     * rootIdentifier, and rewrites all child object identifiers so that they
+     * exist in the same namespace as the rootIdentifier.
+     */
+    function rewriteObjectIdentifiers(importData, rootIdentifier) {
+        var rootId = importData.rootId;
+        var objectString = JSON.stringify(importData.openmct);
+
+        Object.keys(importData.openmct).forEach(function (originalId, i) {
+            var newId;
+            if (originalId === rootId) {
+                newId = objectUtils.makeKeyString(rootIdentifier);
+            } else {
+                newId = objectUtils.makeKeyString({
+                    namespace: rootIdentifier.namespace,
+                    key: i
+                });
+            }
+            while (objectString.indexOf(originalId) !== -1) {
+                objectString = objectString.replace(
+                    '"' + originalId + '"',
+                    '"' + newId + '"'
+                );
+            }
+        });
+
+        return JSON.parse(objectString);
+    }
+
+    /**
+     * Convets all objects in an object make from old format objects to new
+     * format objects.
+     */
+    function convertToNewObjects(oldObjectMap) {
+        return Object.keys(oldObjectMap)
+            .reduce(function (newObjectMap, key) {
+                newObjectMap[key] = objectUtils.toNewFormat(oldObjectMap[key], key);
+                return newObjectMap;
+            }, {});
+    }
+
+    /* Set the root location correctly for a top-level object */
+    function setRootLocation(objectMap, rootIdentifier) {
+        objectMap[objectUtils.makeKeyString(rootIdentifier)].location = 'ROOT';
+        return objectMap;
+    }
+
+    /**
+     * Takes importData (as provided by the ImportExport plugin) and exposes
+     * an object provider to fetch those objects.
+     */
+    function StaticModelProvider(importData, rootIdentifier) {
+        var oldFormatObjectMap = rewriteObjectIdentifiers(importData, rootIdentifier);
+        var newFormatObjectMap = convertToNewObjects(oldFormatObjectMap);
+        this.objectMap = setRootLocation(newFormatObjectMap, rootIdentifier);
+    }
+
+    /**
+     * Standard "Get".
+     */
+    StaticModelProvider.prototype.get = function (identifier) {
+        var keyString = objectUtils.makeKeyString(identifier);
+        if (this.objectMap[keyString]) {
+            return this.objectMap[keyString];
+        }
+        throw new Error(keyString + ' not found in import models.');
+    };
+
+    return StaticModelProvider;
+
+});

src/plugins/staticRootPlugin/StaticModelProviderSpec.js

@@ -0,0 +1,133 @@
+define([
+    './StaticModelProvider',
+    'text!./static-provider-test.json'
+], function (
+    StaticModelProvider,
+    testStaticDataText
+) {
+
+    describe('StaticModelProvider', function () {
+
+        var staticProvider;
+
+        beforeEach(function () {
+            var staticData = JSON.parse(testStaticDataText);
+            staticProvider = new StaticModelProvider(staticData, {
+                namespace: 'my-import',
+                key: 'root'
+            });
+        });
+
+        describe('rootObject', function () {
+            var rootModel;
+
+            beforeEach(function () {
+                rootModel = staticProvider.get({
+                    namespace: 'my-import',
+                    key: 'root'
+                });
+            });
+
+            it('is located at top level', function () {
+                expect(rootModel.location).toBe('ROOT');
+            });
+
+            it('has new-format identifier', function () {
+                expect(rootModel.identifier).toEqual({
+                    namespace: 'my-import',
+                    key: 'root'
+                });
+            });
+
+            it('has new-format composition', function () {
+                expect(rootModel.composition).toContain({
+                    namespace: 'my-import',
+                    key: '1'
+                });
+                expect(rootModel.composition).toContain({
+                    namespace: 'my-import',
+                    key: '2'
+                });
+            });
+        });
+
+        describe('childObjects', function () {
+            var swg;
+            var layout;
+            var fixed;
+
+            beforeEach(function () {
+                swg = staticProvider.get({
+                    namespace: 'my-import',
+                    key: '1'
+                });
+                layout = staticProvider.get({
+                    namespace: 'my-import',
+                    key: '2'
+                });
+                fixed = staticProvider.get({
+                    namespace: 'my-import',
+                    key: '3'
+                });
+            });
+
+            it('match expected ordering', function () {
+                // this is a sanity check to make sure the identifiers map in
+                // the correct order.
+                expect(swg.type).toBe('generator');
+                expect(layout.type).toBe('layout');
+                expect(fixed.type).toBe('telemetry.fixed');
+            });
+
+            it('have new-style identifiers', function () {
+                expect(swg.identifier).toEqual({
+                    namespace: 'my-import',
+                    key: '1'
+                });
+                expect(layout.identifier).toEqual({
+                    namespace: 'my-import',
+                    key: '2'
+                });
+                expect(fixed.identifier).toEqual({
+                    namespace: 'my-import',
+                    key: '3'
+                });
+            });
+
+            it('have new-style composition', function () {
+                expect(layout.composition).toContain({
+                    namespace: 'my-import',
+                    key: '1'
+                });
+                expect(layout.composition).toContain({
+                    namespace: 'my-import',
+                    key: '3'
+                });
+                expect(fixed.composition).toContain({
+                    namespace: 'my-import',
+                    key: '1'
+                });
+            });
+
+            it('rewrites locations', function () {
+                expect(swg.location).toBe('my-import:root');
+                expect(layout.location).toBe('my-import:root');
+                expect(fixed.location).toBe('my-import:2');
+            });
+
+            it('rewrites matched identifiers in objects', function () {
+                expect(layout.configuration.layout.panels['my-import:1'])
+                    .toBeDefined();
+                expect(layout.configuration.layout.panels['my-import:3'])
+                    .toBeDefined();
+                expect(layout.configuration.layout.panels['483c00d4-bb1d-4b42-b29a-c58e06b322a0'])
+                    .not.toBeDefined();
+                expect(layout.configuration.layout.panels['20273193-f069-49e9-b4f7-b97a87ed755d'])
+                    .not.toBeDefined();
+                expect(fixed.configuration['fixed-display'].elements[0].id)
+                    .toBe('my-import:1');
+            });
+
+        });
+    });
+});

src/plugins/staticRootPlugin/plugin.js

@@ -0,0 +1,51 @@
+define([
+    './StaticModelProvider'
+], function (
+    StaticModelProvider
+) {
+    /**
+     * Static Root Plugin: takes an export file and exposes it as a new root
+     * object.
+     */
+    function StaticRootPlugin(namespace, exportUrl) {
+
+        var rootIdentifier = {
+            namespace: namespace,
+            key: 'root'
+        };
+
+        var cachedProvider;
+
+        var loadProvider = function () {
+            return fetch(exportUrl)
+                .then(function (response) {
+                    return response.json();
+                })
+                .then(function (importData) {
+                    cachedProvider = new StaticModelProvider(importData, rootIdentifier);
+                    return cachedProvider;
+                });
+
+        };
+
+        var getProvider = function () {
+            if (!cachedProvider) {
+                cachedProvider = loadProvider();
+            }
+            return Promise.resolve(cachedProvider);
+        };
+
+        return function install(openmct) {
+            openmct.objects.addRoot(rootIdentifier);
+            openmct.objects.addProvider(namespace, {
+                get: function (identifier) {
+                    return getProvider().then(function (provider) {
+                        return provider.get(identifier);
+                    });
+                }
+            });
+        };
+    }
+
+    return StaticRootPlugin;
+});

src/plugins/staticRootPlugin/static-provider-test.json

@@ -0,0 +1 @@
+{"openmct":{"a9122832-4b6e-43ea-8219-5359c14c5de8":{"composition":["483c00d4-bb1d-4b42-b29a-c58e06b322a0","d2ac3ae4-0af2-49fe-81af-adac09936215"],"name":"import-provider-test","type":"folder","notes":"test data for import provider.","modified":1508522673278,"location":"mine","persisted":1508522673278},"483c00d4-bb1d-4b42-b29a-c58e06b322a0":{"telemetry":{"period":10,"amplitude":1,"offset":0,"dataRateInHz":1,"values":[{"key":"utc","name":"Time","format":"utc","hints":{"domain":1,"priority":0},"source":"utc"},{"key":"yesterday","name":"Yesterday","format":"utc","hints":{"domain":2,"priority":1},"source":"yesterday"},{"key":"sin","name":"Sine","hints":{"range":1,"priority":2},"source":"sin"},{"key":"cos","name":"Cosine","hints":{"range":2,"priority":3},"source":"cos"}]},"name":"SWG-10","type":"generator","modified":1508522652874,"location":"a9122832-4b6e-43ea-8219-5359c14c5de8","persisted":1508522652874},"d2ac3ae4-0af2-49fe-81af-adac09936215":{"composition":["483c00d4-bb1d-4b42-b29a-c58e06b322a0","20273193-f069-49e9-b4f7-b97a87ed755d"],"name":"Layout","type":"layout","configuration":{"layout":{"panels":{"483c00d4-bb1d-4b42-b29a-c58e06b322a0":{"position":[0,0],"dimensions":[17,8]},"20273193-f069-49e9-b4f7-b97a87ed755d":{"position":[0,8],"dimensions":[17,1],"hasFrame":false}}}},"modified":1508522745580,"location":"a9122832-4b6e-43ea-8219-5359c14c5de8","persisted":1508522745580},"20273193-f069-49e9-b4f7-b97a87ed755d":{"layoutGrid":[64,16],"composition":["483c00d4-bb1d-4b42-b29a-c58e06b322a0"],"name":"FP Test","type":"telemetry.fixed","configuration":{"fixed-display":{"elements":[{"type":"fixed.telemetry","x":0,"y":0,"id":"483c00d4-bb1d-4b42-b29a-c58e06b322a0","stroke":"transparent","color":"","titled":true,"width":8,"height":2,"useGrid":true,"size":"24px"}]}},"modified":1508522717619,"location":"d2ac3ae4-0af2-49fe-81af-adac09936215","persisted":1508522717619}},"rootId":"a9122832-4b6e-43ea-8219-5359c14c5de8"}

src/plugins/summaryWidget/SummaryWidgetsCompositionPolicy.js

@@ -32,7 +32,7 @@ define(
             var parentType = parent.getCapability('type');
             var newStyleChild = child.useCapability('adapter');
 
-            if (parentType.instanceOf('summary-widget') && !this.openmct.telemetry.canProvideTelemetry(newStyleChild)) {
+            if (parentType.instanceOf('summary-widget') && !this.openmct.telemetry.isTelemetryObject(newStyleChild)) {
                 return false;
             }
 

src/plugins/summaryWidget/src/ConditionManager.js

@@ -191,7 +191,7 @@ define ([
             telemetryMetadata,
             self = this;
 
-        if (telemetryAPI.canProvideTelemetry(obj)) {
+        if (telemetryAPI.isTelemetryObject(obj)) {
             self.compositionObjs[objId] = obj;
             self.telemetryMetadataById[objId] = {};
 

src/plugins/summaryWidget/test/ConditionManagerSpec.js

@@ -178,7 +178,7 @@ define(['../src/ConditionManager'], function (ConditionManager) {
 
             mockTelemetryAPI = jasmine.createSpyObj('telemetryAPI', [
                 'request',
-                'canProvideTelemetry',
+                'isTelemetryObject',
                 'getMetadata',
                 'subscribe',
                 'triggerTelemetryCallback'
@@ -188,7 +188,7 @@ define(['../src/ConditionManager'], function (ConditionManager) {
                     resolve(mockTelemetryValues[obj.identifer.key]);
                 });
             });
-            mockTelemetryAPI.canProvideTelemetry.andReturn(true);
+            mockTelemetryAPI.isTelemetryObject.andReturn(true);
             mockTelemetryAPI.getMetadata.andCallFake(function (obj) {
                 return mockMetadataManagers[obj.identifier.key];
             });

test-main.js

@@ -75,7 +75,8 @@ requirejs.config({
         "d3-format": "node_modules/d3-format/build/d3-format.min",
         "d3-interpolate": "node_modules/d3-interpolate/build/d3-interpolate.min",
         "d3-time": "node_modules/d3-time/build/d3-time.min",
-        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min"
+        "d3-time-format": "node_modules/d3-time-format/build/d3-time-format.min",
+        "d3-dsv": "node_modules/d3-dsv/build/d3-dsv.min"
     },
 
     "shim": {