these are andrews time conductor fixes

[Search] Allow navigation from results

README.md

@@ -1,6 +1,6 @@
 # Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
 
-Open MCT is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
+Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
 
 Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)
 

docs/src/architecture/framework.md

@@ -131,7 +131,7 @@ Keeping that in mind, there are a few useful patterns supported by the
 framework that are useful to keep in mind.
 
 The specific service infrastructure provided by the platform is described
-in the [Platform Architecture](Platform.md).
+in the [Platform Architecture](platform.md).
 
 ## Extension Categories
 

docs/src/guide/index.md

@@ -2261,10 +2261,7 @@ The platform understands the following policy categories (specifiable as the
 
 * `action`: Determines whether or not a given action is allowable. The candidate 
 argument here is an Action; the context is its action context object.
-* `composition`: Determines whether or not domain objects of a given type are 
-allowed to contain domain objects of another type. The candidate argument here 
-is the container's `Type`; the context argument is the `Type` of the object to be 
-contained.
+* `composition`: Determines whether or not domain objects of a given type (first argument, `parentType`) can contain a given object (second argument, `child`).
 * `view`: Determines whether or not a view is applicable for a domain object. 
 The candidate argument is the view's extension definition; the context argument 
 is the `DomainObject` to be viewed.

example/generator/bundle.js

@@ -0,0 +1,184 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2016, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+/*global define*/
+
+define([
+    "./src/SinewaveTelemetryProvider",
+    "./src/SinewaveLimitCapability",
+    "./src/SinewaveDeltaFormat",
+    'legacyRegistry'
+], function (
+    SinewaveTelemetryProvider,
+    SinewaveLimitCapability,
+    SinewaveDeltaFormat,
+    legacyRegistry
+) {
+    "use strict";
+
+    legacyRegistry.register("example/generator", {
+        "name": "Sine Wave Generator",
+        "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
+        "extensions": {
+            "components": [
+                {
+                    "implementation": SinewaveTelemetryProvider,
+                    "type": "provider",
+                    "provides": "telemetryService",
+                    "depends": [
+                        "$q",
+                        "$timeout"
+                    ]
+                }
+            ],
+            "capabilities": [
+                {
+                    "key": "limit",
+                    "implementation": SinewaveLimitCapability
+                }
+            ],
+            "formats": [
+                {
+                    "key": "example.delta",
+                    "implementation": SinewaveDeltaFormat
+                }
+            ],
+            "constants": [
+                {
+                    "key": "TIME_CONDUCTOR_DOMAINS",
+                    "value": [
+                        {
+                            "key": "time",
+                            "name": "Time"
+                        },
+                        {
+                            "key": "yesterday",
+                            "name": "Yesterday"
+                        },
+                        {
+                            "key": "delta",
+                            "name": "Delta"
+                        }
+                    ],
+                    "priority": -1
+                }
+            ],
+            "types": [
+                {
+                    "key": "generator",
+                    "name": "Sine Wave Generator",
+                    "cssClass": "icon-telemetry",
+                    "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
+                    "priority": 10,
+                    "features": "creation",
+                    "model": {
+                        "telemetry": {
+                            "period": 10,
+                            "amplitude": 1,
+                            "offset": 0,
+                            "dataRateInHz": 1
+                        }
+                    },
+                    "telemetry": {
+                        "source": "generator",
+                        "domains": [
+                            {
+                                "key": "utc",
+                                "name": "Time",
+                                "format": "utc"
+                            },
+                            {
+                                "key": "yesterday",
+                                "name": "Yesterday",
+                                "format": "utc"
+                            },
+                            {
+                                "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*)?$"
+                        },
+                        {
+                            "name": "Amplitude",
+                            "control": "textfield",
+                            "cssClass": "l-input-sm l-numeric",
+                            "key": "amplitude",
+                            "required": true,
+                            "property": [
+                                "telemetry",
+                                "amplitude"
+                            ],
+                            "pattern": "^\\d*(\\.\\d*)?$"
+                        },
+                        {
+                            "name": "Offset",
+                            "control": "textfield",
+                            "cssClass": "l-input-sm l-numeric",
+                            "key": "offset",
+                            "required": true,
+                            "property": [
+                                "telemetry",
+                                "offset"
+                            ],
+                            "pattern": "^\\d*(\\.\\d*)?$"
+                        },
+                        {
+                            "name": "Data Rate (hz)",
+                            "control": "textfield",
+                            "cssClass": "l-input-sm l-numeric",
+                            "key": "dataRateInHz",
+                            "required": true,
+                            "property": [
+                                "telemetry",
+                                "dataRateInHz"
+                            ],
+                            "pattern": "^\\d*(\\.\\d*)?$"
+                        }
+                    ]
+                }
+            ]
+        }
+    });
+});

example/generator/src/GeneratorProvider.js

@@ -41,10 +41,6 @@ define([
         return domainObject.type === 'generator';
     };
 
-    GeneratorProvider.prototype.supportsRequest =
-        GeneratorProvider.prototype.supportsSubscribe =
-            GeneratorProvider.prototype.canProvideTelemetry;
-
     GeneratorProvider.prototype.makeWorkerRequest = function (domainObject, request) {
         var props = [
             'amplitude',

index.html

@@ -28,10 +28,11 @@
     <script src="bower_components/requirejs/require.js">
     </script>
     <script>
-        require(['openmct'], function (openmct, generatorPlugin) {
+        require(['openmct'], function (openmct) {
             [
                 'example/imagery',
-                'example/eventGenerator'
+                'example/eventGenerator',
+                'example/generator'
             ].forEach(
                 openmct.legacyRegistry.enable.bind(openmct.legacyRegistry)
             );
@@ -39,12 +40,11 @@
             openmct.install(openmct.plugins.localStorage);
             openmct.install(openmct.plugins.espresso);
 
-            openmct.install(openmct.plugins.Generator());
             openmct.install(openmct.plugins.UTCTimeSystem());
             openmct.install(openmct.plugins.Conductor({
                 defaultTimeSystem: 'utc',
                 defaultTimespan: 30 * 60 * 1000,
-                showConductor: true
+                showConductor: false
             }));
 
             openmct.start();

platform/commonUI/browse/src/navigation/OrphanNavigationHandler.js

@@ -48,7 +48,7 @@ define([], function () {
             parent.useCapability('composition')
                 .then(function (composees) {
                     var isOrphan = composees.every(function (c) {
-                        return c.getId() !== domainObject.getId()
+                        return c.getId() !== domainObject.getId();
                     });
                     if (isOrphan) {
                         parent.getCapability('action').perform('navigate');

platform/commonUI/browse/test/navigation/OrphanNavigationHandlerSpec.js

@@ -33,7 +33,7 @@ define([
             mockContext,
             mockActionCapability,
             mockEditor,
-            testParentModel,
+            testParentComposition,
             testId,
             mockThrottledFns;
 
@@ -41,7 +41,6 @@ define([
             testId = 'some-identifier';
 
             mockThrottledFns = [];
-            testParentModel = {};
 
             mockTopic = jasmine.createSpy('topic');
             mockThrottle = jasmine.createSpy('throttle');
@@ -55,14 +54,12 @@ define([
             mockDomainObject = jasmine.createSpyObj('domainObject', [
                 'getId',
                 'getCapability',
-                'getModel',
                 'hasCapability'
             ]);
             mockParentObject = jasmine.createSpyObj('domainObject', [
                 'getId',
                 'getCapability',
-                'getModel',
-                'hasCapability'
+                'useCapability'
             ]);
             mockContext = jasmine.createSpyObj('context', ['getParent']);
             mockActionCapability = jasmine.createSpyObj('action', ['perform']);
@@ -75,9 +72,7 @@ define([
                 mockThrottledFns.push(mockThrottledFn);
                 return mockThrottledFn;
             });
-            mockTopic.andCallFake(function (k) {
-                return k === 'mutation' && mockMutationTopic;
-            });
+            mockTopic.andReturn(mockMutationTopic);
             mockDomainObject.getId.andReturn(testId);
             mockDomainObject.getCapability.andCallFake(function (c) {
                 return {
@@ -88,12 +83,13 @@ define([
             mockDomainObject.hasCapability.andCallFake(function (c) {
                 return !!mockDomainObject.getCapability(c);
             });
-            mockParentObject.getModel.andReturn(testParentModel);
             mockParentObject.getCapability.andCallFake(function (c) {
                 return {
                     action: mockActionCapability
                 }[c];
             });
+            testParentComposition = [];
+            mockParentObject.useCapability.andReturn(Promise.resolve(testParentComposition));
             mockContext.getParent.andReturn(mockParentObject);
             mockNavigationService.getNavigation.andReturn(mockDomainObject);
             mockEditor.isEditContextRoot.andReturn(false);
@@ -126,7 +122,9 @@ define([
             var prefix = isOrphan ? "" : "non-";
             describe("for " + prefix + "orphan objects", function () {
                 beforeEach(function () {
-                    testParentModel.composition = isOrphan ? [] : [testId];
+                    if (!isOrphan) {
+                        testParentComposition.push(mockDomainObject);
+                    }
                 });
 
                 [false, true].forEach(function (isEditRoot) {
@@ -136,13 +134,31 @@ define([
                     function itNavigatesAsExpected() {
                         if (isOrphan && !isEditRoot) {
                             it("navigates to the parent", function () {
-                                expect(mockActionCapability.perform)
-                                    .toHaveBeenCalledWith('navigate');
+                                var done = false;
+                                waitsFor(function () {
+                                    return done;
+                                });
+                                setTimeout(function () {
+                                    done = true;
+                                }, 5);
+                                runs(function () {
+                                    expect(mockActionCapability.perform)
+                                        .toHaveBeenCalledWith('navigate');
+                                });
                             });
                         } else {
                             it("does nothing", function () {
-                                expect(mockActionCapability.perform)
-                                    .not.toHaveBeenCalled();
+                                var done = false;
+                                waitsFor(function () {
+                                    return done;
+                                });
+                                setTimeout(function () {
+                                    done = true;
+                                }, 5);
+                                runs(function () {
+                                    expect(mockActionCapability.perform)
+                                        .not.toHaveBeenCalled();
+                                });
                             });
                         }
                     }
@@ -157,7 +173,6 @@ define([
                                 mockNavigationService.addListener.mostRecentCall
                                     .args[0](mockDomainObject);
                             });
-
                             itNavigatesAsExpected();
                         });
 

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

@@ -54,8 +54,7 @@ define(
         AddActionProvider.prototype.getActions = function (actionContext) {
             var context = actionContext || {},
                 key = context.key,
-                destination = context.domainObject,
-                self = this;
+                destination = context.domainObject;
 
             // We only provide Add actions, and we need a
             // domain object to serve as the container for the
@@ -66,16 +65,16 @@ define(
             }
 
             // Introduce one create action per type
-            ['timeline', 'activity'].map(function (type) {
+            return ['timeline', 'activity'].map(function (type) {
                 return new AddAction(
-                    type,
+                    this.typeService.getType(type),
                     destination,
                     context,
-                    self.$q,
-                    self.dialogService,
-                    self.policyService
+                    this.$q,
+                    this.dialogService,
+                    this.policyService
                 );
-            });
+            }, this);
         };
 
         return AddActionProvider;

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

@@ -59,12 +59,12 @@ define(
                 domainObject = this.domainObject,
                 policyService = this.policyService;
 
-            function validateLocation(locatingObject) {
-                var locatingType = locatingObject &&
-                    locatingObject.getCapability('type');
-                return locatingType && policyService.allow(
+            function validateLocation(parent) {
+                var parentType = parent &&
+                    parent.getCapability('type');
+                return parentType && policyService.allow(
                     "composition",
-                    locatingType,
+                    parentType,
                     domainObject
                 );
             }
@@ -118,7 +118,7 @@ define(
                 formModel = this.createModel(formValue);
 
             formModel.location = parent.getId();
-            this.domainObject.useCapability("mutation", function (model) {
+            this.domainObject.useCapability("mutation", function () {
                 return formModel;
             });
             return this.domainObject;

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

@@ -31,9 +31,7 @@ define(
             var mockTypeService,
                 mockDialogService,
                 mockPolicyService,
-                mockCreationPolicy,
-                mockCompositionPolicy,
-                mockPolicyMap = {},
+                mockTypeMap,
                 mockTypes,
                 mockDomainObject,
                 mockQ,
@@ -55,49 +53,33 @@ define(
                 );
                 mockType.hasFeature.andReturn(true);
                 mockType.getName.andReturn(name);
+                mockType.getKey.andReturn(name);
                 return mockType;
             }
 
             beforeEach(function () {
                 mockTypeService = jasmine.createSpyObj(
                     "typeService",
-                    ["listTypes"]
-                );
-                mockDialogService = jasmine.createSpyObj(
-                    "dialogService",
-                    ["getUserInput"]
-                );
-                mockPolicyService = jasmine.createSpyObj(
-                    "policyService",
-                    ["allow"]
+                    ["getType"]
                 );
+                mockDialogService = {};
+                mockPolicyService = {};
+                mockDomainObject = {};
 
-                mockDomainObject = jasmine.createSpyObj(
-                    "domainObject",
-                    ["getCapability"]
-                );
-
-                //Mocking getCapability because AddActionProvider uses the
-                // type capability of the destination object.
-                mockDomainObject.getCapability.andReturn({});
-
-                mockTypes = ["A", "B", "C"].map(createMockType);
+                mockTypes = [
+                    "timeline",
+                    "activity",
+                    "other"
+                ].map(createMockType);
+                mockTypeMap = {};
 
                 mockTypes.forEach(function (type) {
-                    mockPolicyMap[type.getName()] = true;
+                    mockTypeMap[type.getKey()] = type;
                 });
 
-                mockCreationPolicy = function (type) {
-                    return mockPolicyMap[type.getName()];
-                };
-
-                mockCompositionPolicy = function () {
-                    return true;
-                };
-
-                mockPolicyService.allow.andReturn(true);
-
-                mockTypeService.listTypes.andReturn(mockTypes);
+                mockTypeService.getType.andCallFake(function (key) {
+                    return mockTypeMap[key];
+                });
 
                 provider = new AddActionProvider(
                     mockQ,
@@ -107,29 +89,16 @@ define(
                 );
             });
 
-            it("checks for creatability", function () {
-                provider.getActions({
+            it("provides actions for timeline and activity", function () {
+                var actions = provider.getActions({
                     key: "add",
                     domainObject: mockDomainObject
                 });
+                expect(actions.length).toBe(2);
+                expect(actions[0].metadata.type).toBe('timeline');
+                expect(actions[1].metadata.type).toBe('activity');
+
                 // Make sure it was creation which was used to check
-                expect(mockPolicyService.allow)
-                    .toHaveBeenCalledWith("creation", mockTypes[0]);
-            });
-
-            it("checks for composability of type", function () {
-                provider.getActions({
-                    key: "add",
-                    domainObject: mockDomainObject
-                });
-
-                expect(mockPolicyService.allow).toHaveBeenCalledWith(
-                    "composition",
-                    jasmine.any(Object),
-                    jasmine.any(Object)
-                );
-
-                expect(mockDomainObject.getCapability).toHaveBeenCalledWith('type');
             });
         });
     }

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

@@ -175,7 +175,7 @@ define(
                 expect(mockPolicyService.allow).toHaveBeenCalledWith(
                     'composition',
                     mockOtherType,
-                    mockType
+                    mockDomainObject
                 );
             });
 

platform/containment/src/CompositionPolicy.js

@@ -38,22 +38,20 @@ define(
         function CompositionPolicy() {
         }
 
-        CompositionPolicy.prototype.allow = function (candidate, context) {
-            var type = context.getCapability('type');
-            var typeKey = type.getKey();
-            var candidateDef = candidate.getDefinition();
-            
-            // A candidate without containment rules can contain anything.
-            if (!candidateDef.contains) {
+        CompositionPolicy.prototype.allow = function (parentType, child) {
+            var parentDef = parentType.getDefinition();
+
+            // A parent without containment rules can contain anything.
+            if (!parentDef.contains) {
                 return true;
             }
-            
+
             // If any containment rule matches context type, the candidate
             // can contain this type.
-            return candidateDef.contains.some(function (c) {
+            return parentDef.contains.some(function (c) {
                 // Simple containment rules are supported typeKeys.
                 if (typeof c === 'string') {
-                    return c === typeKey;
+                    return c === child.getCapability('type').getKey();
                 }
                 // More complicated rules require context to have all specified
                 // capabilities.
@@ -61,7 +59,7 @@ define(
                     c.has = [c.has];
                 }
                 return c.has.every(function (capability) {
-                    return context.hasCapability(capability);
+                    return child.hasCapability(capability);
                 });
             });
         };

platform/containment/test/ComposeActionPolicySpec.js

@@ -79,7 +79,7 @@ define(
                 expect(mockPolicyService.allow).toHaveBeenCalledWith(
                     'composition',
                     mockTypes[0],
-                    mockTypes[1]
+                    mockDomainObjects[1]
                 );
             });
 

platform/containment/test/CompositionPolicySpec.js

@@ -24,60 +24,94 @@ define(
     ["../src/CompositionPolicy"],
     function (CompositionPolicy) {
         describe("Composition policy", function () {
-            var mockInjector,
-                mockTypeService,
-                mockCapabilityService,
-                mockTypes,
+            var typeA,
+                typeB,
+                typeC,
+                mockChildObject,
                 policy;
 
             beforeEach(function () {
-                mockInjector = jasmine.createSpyObj('$injector', ['get']);
-                mockTypeService = jasmine.createSpyObj(
-                    'typeService',
-                    ['listTypes']
+                typeA = jasmine.createSpyObj(
+                    'type A-- the particular kind',
+                    ['getKey', 'getDefinition']
                 );
-                mockCapabilityService = jasmine.createSpyObj(
-                    'capabilityService',
-                    ['getCapabilities']
-                );
-                // Both types can only contain b, let's say
-                mockTypes = ['a', 'b'].map(function (type) {
-                    var mockType = jasmine.createSpyObj(
-                        'type-' + type,
-                        ['getKey', 'getDefinition', 'getInitialModel']
-                    );
-                    mockType.getKey.andReturn(type);
-                    mockType.getDefinition.andReturn({
-                        contains: ['b']
-                    });
-                    mockType.getInitialModel.andReturn({});
-                    return mockType;
+                typeA.getKey.andReturn('a');
+                typeA.getDefinition.andReturn({
+                    contains: ['a']
                 });
 
-                mockInjector.get.andCallFake(function (name) {
-                    return {
-                        typeService: mockTypeService,
-                        capabilityService: mockCapabilityService
-                    }[name];
+
+                typeB = jasmine.createSpyObj(
+                    'type B-- anything goes',
+                    ['getKey', 'getDefinition']
+                );
+                typeB.getKey.andReturn('b');
+                typeB.getDefinition.andReturn({
+                    contains: ['a', 'b']
                 });
 
-                mockTypeService.listTypes.andReturn(mockTypes);
-                mockCapabilityService.getCapabilities.andReturn({});
+                typeC = jasmine.createSpyObj(
+                    'type C-- distinguishing and interested in telemetry',
+                    ['getKey', 'getDefinition']
+                );
+                typeC.getKey.andReturn('c');
+                typeC.getDefinition.andReturn({
+                    contains: [{has: 'telemetry'}]
+                });
 
-                policy = new CompositionPolicy(mockInjector);
+                mockChildObject = jasmine.createSpyObj(
+                    'childObject',
+                    ['getCapability', 'hasCapability']
+                );
+
+                policy = new CompositionPolicy();
             });
 
-            // Test basic composition policy here; test more closely at
-            // the unit level in ContainmentTable for 'has' support, et al
-            it("enforces containment rules defined by types", function () {
-                expect(policy.allow(mockTypes[0], mockTypes[1]))
-                    .toBeTruthy();
-                expect(policy.allow(mockTypes[1], mockTypes[1]))
-                    .toBeTruthy();
-                expect(policy.allow(mockTypes[1], mockTypes[0]))
-                    .toBeFalsy();
-                expect(policy.allow(mockTypes[0], mockTypes[0]))
-                    .toBeFalsy();
+            describe('enforces simple containment rules', function () {
+
+                it('allows when type matches', function () {
+                    mockChildObject.getCapability.andReturn(typeA);
+                    expect(policy.allow(typeA, mockChildObject))
+                        .toBeTruthy();
+
+                    expect(policy.allow(typeB, mockChildObject))
+                        .toBeTruthy();
+
+                    mockChildObject.getCapability.andReturn(typeB);
+                    expect(policy.allow(typeB, mockChildObject))
+                        .toBeTruthy();
+                });
+
+
+                it('disallows when type doesn\'t match', function () {
+
+                    mockChildObject.getCapability.andReturn(typeB);
+                    expect(policy.allow(typeA, mockChildObject))
+                        .toBeFalsy();
+
+                    mockChildObject.getCapability.andReturn(typeC);
+                    expect(policy.allow(typeA, mockChildObject))
+                        .toBeFalsy();
+                });
+
+            });
+
+            describe('enforces capability-based containment rules', function () {
+                it('allows when object has capability', function () {
+                    mockChildObject.hasCapability.andReturn(true);
+                    expect(policy.allow(typeC, mockChildObject))
+                        .toBeTruthy();
+                    expect(mockChildObject.hasCapability)
+                        .toHaveBeenCalledWith('telemetry');
+                });
+
+                it('skips when object doesn\'t have capability', function () {
+                    mockChildObject.hasCapability.andReturn(false);
+                    expect(policy.allow(typeC, mockChildObject))
+                        .toBeFalsy();
+                    expect(mockChildObject.hasCapability)
+                        .toHaveBeenCalledWith('telemetry');
+                });
             });
 
         });

platform/core/src/services/Contextualize.js

@@ -44,16 +44,16 @@ define(
                 var model = parentObject && parentObject.getModel(),
                     composition = (model || {}).composition || [];
                 if (composition.indexOf(id) === -1) {
-                    // $log.warn([
-                    //     "Attempted to contextualize",
-                    //     id,
-                    //     "in",
-                    //     parentObject && parentObject.getId(),
-                    //     "but that object does not contain",
-                    //     id,
-                    //     "in its composition.",
-                    //     "Unexpected behavior may follow."
-                    // ].join(" "));
+                    $log.warn([
+                        "Attempted to contextualize",
+                        id,
+                        "in",
+                        parentObject && parentObject.getId(),
+                        "but that object does not contain",
+                        id,
+                        "in its composition.",
+                        "Unexpected behavior may follow."
+                    ].join(" "));
                 }
             }
 

platform/entanglement/test/services/CopyServiceSpec.js

@@ -104,7 +104,7 @@ define(
                         expect(policyService.allow).toHaveBeenCalledWith(
                             "composition",
                             parentCandidate.capabilities.type,
-                            object.capabilities.type
+                            object
                         );
                     });
 

platform/entanglement/test/services/LinkServiceSpec.js

@@ -114,7 +114,7 @@ define(
                         expect(mockPolicyService.allow).toHaveBeenCalledWith(
                             "composition",
                             parentCandidate.capabilities.type,
-                            object.capabilities.type
+                            object
                         );
                     });
 

platform/entanglement/test/services/MoveServiceSpec.js

@@ -124,7 +124,7 @@ define(
                         expect(policyService.allow).toHaveBeenCalledWith(
                             "composition",
                             parentCandidate.capabilities.type,
-                            object.capabilities.type
+                            object
                         );
                     });
 

platform/features/layout/src/LayoutCompositionPolicy.js

@@ -34,13 +34,14 @@ define(
         function LayoutCompositionPolicy() {
         }
 
-        LayoutCompositionPolicy.prototype.allow = function (candidate, context) {
-            var isFolderInLayout =
-                candidate &&
-                context &&
-                candidate.instanceOf('layout') &&
-                context.getCapability('type').instanceOf('folder');
-            return !isFolderInLayout;
+        LayoutCompositionPolicy.prototype.allow = function (parentType, child) {
+            if (parentType.instanceOf('layout') &&
+                child.getCapability('type').instanceOf('folder')) {
+
+                return false;
+            }
+
+            return true;
         };
 
         return LayoutCompositionPolicy;

platform/features/layout/test/LayoutCompositionPolicySpec.js

@@ -24,18 +24,25 @@ define(
     ["../src/LayoutCompositionPolicy"],
     function (LayoutCompositionPolicy) {
         describe("Layout's composition policy", function () {
-            var mockCandidate,
+            var mockChild,
+                mockCandidate,
                 mockContext,
                 candidateType,
                 contextType,
                 policy;
 
             beforeEach(function () {
+                mockChild = jasmine.createSpyObj(
+                    'childObject',
+                    ['getCapability']
+                );
                 mockCandidate =
                     jasmine.createSpyObj('candidateType', ['instanceOf']);
                 mockContext =
                     jasmine.createSpyObj('contextType', ['instanceOf']);
 
+                mockChild.getCapability.andReturn(mockContext);
+
                 mockCandidate.instanceOf.andCallFake(function (t) {
                     return t === candidateType;
                 });
@@ -49,19 +56,19 @@ define(
             it("disallows folders in layouts", function () {
                 candidateType = 'layout';
                 contextType = 'folder';
-                expect(policy.allow(mockCandidate, mockContext)).toBe(false);
+                expect(policy.allow(mockCandidate, mockChild)).toBe(false);
             });
 
             it("does not disallow folders elsewhere", function () {
                 candidateType = 'nonlayout';
                 contextType = 'folder';
-                expect(policy.allow(mockCandidate, mockContext)).toBe(true);
+                expect(policy.allow(mockCandidate, mockChild)).toBe(true);
             });
 
             it("allows things other than folders in layouts", function () {
                 candidateType = 'layout';
                 contextType = 'nonfolder';
-                expect(policy.allow(mockCandidate, mockContext)).toBe(true);
+                expect(policy.allow(mockCandidate, mockChild)).toBe(true);
             });
 
         });

platform/features/table/res/templates/mct-table.html

@@ -60,7 +60,7 @@
             </tr>
             <tr ng-repeat-end
                 ng-style="{ top: visibleRow.offsetY + 'px' }"
-                ng-click="table.onRowClick($event, visibleRow.rowIndex) ">
+                ng-click="table.onRowClick($event, visibleRow.rowIndex)">
                 <td ng-repeat="header in displayHeaders"
                     ng-style="{
                         width: columnWidths[$index] + 'px',

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

@@ -66,7 +66,8 @@ define(
                 mockDomainObject = jasmine.createSpyObj("domainObject", [
                     "getModel",
                     "getId",
-                    "useCapability"
+                    "useCapability",
+                    "hasCapability"
                 ]);
                 mockDomainObject.getModel.andReturn({});
                 mockDomainObject.getId.andReturn("mockId");

platform/framework/src/register/ServiceCompositor.js

@@ -166,13 +166,13 @@ define(
 
                 // Aggregators need other services to aggregate, otherwise they
                 // do nothing.
-                // if (!latest[service]) {
-                //     return warn(
-                //         aggregator,
-                //         "aggregator",
-                //         "No services to aggregate for"
-                //     );
-                // }
+                if (!latest[service]) {
+                    return warn(
+                        aggregator,
+                        "aggregator",
+                        "No services to aggregate for"
+                    );
+                }
 
                 dependencies = dependencies.concat([providerSetName]);
                 latest[service] = name;

platform/persistence/queue/test/QueuingPersistenceCapabilityDecoratorSpec.js

@@ -32,6 +32,7 @@ define(
                 mockPersistence,
                 mockDomainObject,
                 testModel,
+                testId,
                 decorator;
 
             beforeEach(function () {
@@ -41,6 +42,7 @@ define(
                     ['getCapabilities']
                 );
                 testModel = { someKey: "some value" };
+                testId = 'someId';
                 mockPersistence = jasmine.createSpyObj(
                     'persistence',
                     ['persist', 'refresh']
@@ -67,9 +69,9 @@ define(
             // QueuingPersistenceCapability itself, which has its own tests.
 
             it("delegates to its wrapped service", function () {
-                decorator.getCapabilities(testModel);
+                decorator.getCapabilities(testModel, testId);
                 expect(mockCapabilityService.getCapabilities)
-                    .toHaveBeenCalledWith(testModel);
+                    .toHaveBeenCalledWith(testModel, testId);
             });
 
             it("wraps its persistence capability's constructor", function () {

platform/search/res/templates/search-item.html

@@ -18,14 +18,14 @@
  licenses. See the Open Source Licenses file (LICENSES.md) included with
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
---> 
+-->
 
 <div class="search-result-item l-flex-row flex-elem grows"
      ng-class="{selected: ngModel.selectedObject.getId() === domainObject.getId()}">
     <mct-representation key="'label'"
                         mct-object="domainObject"
                         ng-model="ngModel"
-                        ng-click="ngModel.selectedObject = domainObject"
+                        ng-click="ngModel.allowSelection(domainObject) && ngModel.onSelection(domainObject)"
                         class="l-flex-row flex-elem grows">
     </mct-representation>
-</div>
+</div>

platform/telemetry/bundle.js

@@ -79,7 +79,6 @@ define([
                     "key": "telemetry",
                     "implementation": TelemetryCapability,
                     "depends": [
-                        "openmct",
                         "$injector",
                         "$q",
                         "$log"

platform/telemetry/src/TelemetryCapability.js

@@ -24,12 +24,8 @@
  * Module defining TelemetryCapability. Created by vwoeltje on 11/12/14.
  */
 define(
-    [
-        '../../../src/api/objects/object-utils'
-    ],
-    function (
-        objectUtils
-    ) {
+    [],
+    function () {
 
         var ZERO = function () {
             return 0;
@@ -107,7 +103,7 @@ define(
          * @implements {Capability}
          * @constructor
          */
-        function TelemetryCapability(openmct, $injector, $q, $log, domainObject) {
+        function TelemetryCapability($injector, $q, $log, domainObject) {
             // We could depend on telemetryService directly, but
             // there isn't a platform implementation of this.
             this.initializeTelemetryService = function () {
@@ -122,7 +118,7 @@ define(
                 }
             };
 
-            this.openmct = openmct;
+
             this.$q = $q;
             this.$log = $log;
             this.domainObject = domainObject;
@@ -164,20 +160,6 @@ define(
         };
 
 
-        function asSeries(telemetry, defaultDomain, defaultRange) {
-            return {
-                getRangeValue: function (index, range) {
-                    return telemetry[index][range || defaultRange];
-                },
-                getDomainValue: function (index, domain) {
-                    return telemetry[index][domain || defaultDomain];
-                },
-                getPointCount: function () {
-                    return telemetry.length;
-                }
-            }
-        }
-
         /**
          * Request telemetry data for this specific domain object.
          * @param {TelemetryRequest} [request] parameters for this
@@ -187,21 +169,11 @@ define(
          */
         TelemetryCapability.prototype.requestData = function requestTelemetry(request) {
             // Bring in any defaults from the object model
-            var fullRequest = this.buildRequest(request || {});
-            var source = fullRequest.source;
-            var key = fullRequest.key;
-            var telemetryService = this.telemetryService ||
-                this.initializeTelemetryService(); // Lazy initialization
-
-            var domainObject = objectUtils.toNewFormat(this.domainObject.getModel(), this.domainObject.getId());
-            var telemetryAPI = this.openmct.telemetry;
-
-            var metadata = telemetryAPI.getMetadata(domainObject);
-            var defaultDomain = (metadata.valuesForHints(['domain'])[0] || {}).key;
-            var defaultRange = (metadata.valuesForHints(['range'])[0] || {}).key;
-
-            var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject)
-                    === telemetryAPI.legacyProvider;
+            var fullRequest = this.buildRequest(request || {}),
+                source = fullRequest.source,
+                key = fullRequest.key,
+                telemetryService = this.telemetryService ||
+                    this.initializeTelemetryService(); // Lazy initialization
 
             // Pull out the relevant field from the larger,
             // structured response.
@@ -215,18 +187,11 @@ define(
                 return telemetryService.requestTelemetry([fullRequest]);
             }
 
-            // TODO: Adapt request / options?
-            if (isLegacyProvider) {
-                // If a telemetryService is not available,
-                // getTelemetryService() should reject, and this should
-                // bubble through subsequent then calls.
-                return telemetryService &&
-                    requestTelemetryFromService().then(getRelevantResponse);
-            } else {
-                return telemetryAPI.request(domainObject, fullRequest).then(function (telemetry) {
-                    return asSeries(telemetry, defaultDomain, defaultRange);
-                });
-            }
+            // If a telemetryService is not available,
+            // getTelemetryService() should reject, and this should
+            // bubble through subsequent then calls.
+            return telemetryService &&
+                requestTelemetryFromService().then(getRelevantResponse);
         };
 
         /**
@@ -252,26 +217,12 @@ define(
          *        subscription request
          */
         TelemetryCapability.prototype.subscribe = function subscribe(callback, request) {
-            var fullRequest = this.buildRequest(request || {});
-            var telemetryService = this.telemetryService ||
-                this.initializeTelemetryService(); // Lazy initialization
-
-            var domainObject = objectUtils.toNewFormat(this.domainObject.getModel(), this.domainObject.getId());
-            var telemetryAPI = this.openmct.telemetry;
-
-            var metadata = telemetryAPI.getMetadata(domainObject);
-            var defaultDomain = (metadata.valuesForHints(['domain'])[0] || {}).key;
-            var defaultRange = (metadata.valuesForHints(['range'])[0] || {}).key;
-
-            var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject)
-                === telemetryAPI.legacyProvider;
-
-            function update(telemetry) {
-                callback(asSeries([telemetry], defaultDomain, defaultRange));
-            }
+            var fullRequest = this.buildRequest(request || {}),
+                telemetryService = this.telemetryService ||
+                    this.initializeTelemetryService(); // Lazy initialization
 
             // Unpack the relevant telemetry series
-            function updateLegacy(telemetries) {
+            function update(telemetries) {
                 var source = fullRequest.source,
                     key = fullRequest.key,
                     result = ((telemetries || {})[source] || {})[key];
@@ -280,13 +231,8 @@ define(
                 }
             }
 
-            // Avoid a loop here...
-            if (isLegacyProvider) {
-                return telemetryService &&
-                    telemetryService.subscribe(updateLegacy, [fullRequest]);
-            } else {
-                return telemetryAPI.subscribe(domainObject, update, fullRequest);
-            }
+            return telemetryService &&
+                telemetryService.subscribe(update, [fullRequest]);
         };
 
         /**

src/adapter/policies/AdapterCompositionPolicy.js

@@ -26,14 +26,14 @@ define([], function () {
     }
 
     AdapterCompositionPolicy.prototype.allow = function (
-        containerType,
-        childObject
+        parentType,
+        child
     ) {
-        var containerObject = containerType.getInitialModel();
+        var container = parentType.getInitialModel();
 
         return this.openmct.composition.checkPolicy(
-            containerObject,
-            childObject
+            container,
+            child
         );
     };
 

src/api/telemetry/LegacyTelemetryProvider.js

@@ -146,7 +146,7 @@ define([
             utils.toOldFormat(domainObject),
             utils.makeKeyString(domainObject.identifier));
         var limitEvaluator = oldObject.getCapability("limit");
-        
+
         if (!limitEvaluator) {
             return;
         }
@@ -159,8 +159,7 @@ define([
     };
 
     return function (openmct, instantiate) {
-        // Push onto the start of the default providers array so that it's
-        // always the last resort
+        // Legacy provider should always be the fallback.
         var provider = new LegacyTelemetryProvider(openmct, instantiate);
         openmct.telemetry.legacyProvider = provider;
         openmct.telemetry.requestProviders.push(provider);

src/api/telemetry/TelemetryAPI.js

@@ -176,8 +176,9 @@ define([
      * @private
      */
     TelemetryAPI.prototype.findSubscriptionProvider = function (domainObject) {
+        var args = Array.prototype.slice.apply(arguments);
         function supportsDomainObject(provider) {
-            return provider.supportsSubscribe(domainObject);
+            return provider.supportsSubscribe.apply(provider, args);
         }
 
         return this.subscriptionProviders.filter(supportsDomainObject)[0];
@@ -187,8 +188,9 @@ define([
      * @private
      */
     TelemetryAPI.prototype.findRequestProvider = function (domainObject, options) {
+        var args = Array.prototype.slice.apply(arguments);
         function supportsDomainObject(provider) {
-            return provider.supportsRequest(domainObject);
+            return provider.supportsRequest.apply(provider, args);
         }
 
         return this.requestProviders.filter(supportsDomainObject)[0];
@@ -330,8 +332,7 @@ define([
      */
     TelemetryAPI.prototype.limitEvaluator = function () {
         return this.legacyProvider.limitEvaluator.apply(this.legacyProvider, arguments);
-
-    }
+    };
 
     return TelemetryAPI;
 });

src/api/telemetry/TelemetryMetadataManager.js

@@ -105,6 +105,7 @@ define([
         this.valueMetadatas = this.valueMetadatas.map(applyReasonableDefaults);
     }
 
+
     /**
      * Get value metadata for a single key.
      */

src/api/types/TypeRegistry.js

@@ -51,7 +51,7 @@ define(['./Type'], function (Type) {
      * @method addType
      * @memberof module:openmct.TypeRegistry#
      */
-    TypeRegistry.prototype.register = function (typeKey, typeDef) {
+    TypeRegistry.prototype.addType = function (typeKey, typeDef) {
         this.types[typeKey] = new Type(typeDef);
     };
 

src/defaultRegistry.js

@@ -33,6 +33,7 @@ define([
     '../example/export/bundle',
     '../example/extensions/bundle',
     '../example/forms/bundle',
+    '../example/generator/bundle',
     '../example/identity/bundle',
     '../example/imagery/bundle',
     '../example/mobile/bundle',

src/plugins/generator/plugin.js

@@ -1,171 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    "./GeneratorProvider",
-    "./SinewaveLimitCapability",
-    "./SinewaveDeltaFormat"
-], function (
-    GeneratorProvider,
-    SinewaveLimitCapability,
-    SinewaveDeltaFormat
-) {
-
-    var legacyExtensions = {
-        "capabilities": [
-            {
-                "key": "limit",
-                "implementation": SinewaveLimitCapability
-            }
-        ],
-        "formats": [
-            {
-                "key": "example.delta",
-                "implementation": SinewaveDeltaFormat
-            }
-        ],
-        "constants": [
-            {
-                "key": "TIME_CONDUCTOR_DOMAINS",
-                "value": [
-                    {
-                        "key": "time",
-                        "name": "Time"
-                    },
-                    {
-                        "key": "yesterday",
-                        "name": "Yesterday"
-                    },
-                    {
-                        "key": "delta",
-                        "name": "Delta"
-                    }
-                ],
-                "priority": -1
-            }
-        ]
-    }
-
-    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.register("generator", {
-            label: "Sine Wave Generator",
-            description: "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
-            cssClass: "icon-telemetry",
-            creatable: true,
-            form: [
-                {
-                    name: "Period",
-                    control: "textfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "period",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "period"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
-                },
-                {
-                    name: "Amplitude",
-                    control: "textfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "amplitude",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "amplitude"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
-                },
-                {
-                    name: "Offset",
-                    control: "textfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "offset",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "offset"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
-                },
-                {
-                    name: "Data Rate (hz)",
-                    control: "textfield",
-                    cssClass: "l-input-sm l-numeric",
-                    key: "dataRateInHz",
-                    required: true,
-                    property: [
-                        "telemetry",
-                        "dataRateInHz"
-                    ],
-                    pattern: "^\\d*(\\.\\d*)?$"
-                }
-            ],
-            initialize: function (object) {
-                object.telemetry = {
-                    period: 10,
-                    amplitude: 1,
-                    offset: 0,
-                    dataRateInHz: 1,
-                    domains: [
-                        {
-                            key: "utc",
-                            name: "Time",
-                            format: "utc"
-                        },
-                        {
-                            key: "yesterday",
-                            name: "Yesterday",
-                            format: "utc"
-                        },
-                        {
-                            key: "delta",
-                            name: "Delta",
-                            format: "example.delta"
-                        }
-                    ],
-                    ranges: [
-                        {
-                            key: "sin",
-                            name: "Sine"
-                        },
-                        {
-                            key: "cos",
-                            name: "Cosine"
-                        }
-                    ]
-                };
-            }
-        });
-        openmct.telemetry.addProvider(new GeneratorProvider());
-    };
-
-});

src/plugins/plugins.js

@@ -22,12 +22,10 @@
 
 define([
     'lodash',
-    '../../platform/features/conductor/utcTimeSystem/src/UTCTimeSystem',
-    './generator/plugin'
+    '../../platform/features/conductor/utcTimeSystem/src/UTCTimeSystem'
 ], function (
     _,
-    UTCTimeSystem,
-    GeneratorPlugin
+    UTCTimeSystem
 ) {
     var bundleMap = {
         couchDB: 'platform/persistence/couch',
@@ -138,9 +136,5 @@ define([
         };
     };
 
-    plugins.Generator = function () {
-        return GeneratorPlugin;
-    };
-
     return plugins;
 });