Merge pull request nasa#1459 from nasa/open1458

[Plot] Add current conductor bounds to telemetry requests via the old API.

Author: larkin

platform/features/conductor/compatibility/bundle.js

@@ -21,11 +21,9 @@
  *****************************************************************************/
 
 define([
-    "./src/ConductorTelemetryDecorator",
     "./src/ConductorRepresenter",
     'legacyRegistry'
 ], function (
-    ConductorTelemetryDecorator,
     ConductorRepresenter,
     legacyRegistry
 ) {
@@ -39,16 +37,6 @@ define([
                         "openmct"
                     ]
                 }
-            ],
-            "components": [
-                {
-                    "type": "decorator",
-                    "provides": "telemetryService",
-                    "implementation": ConductorTelemetryDecorator,
-                    "depends": [
-                        "openmct"
-                    ]
-                }
             ]
         }
     });

platform/features/conductor/compatibility/src/ConductorTelemetryDecorator.js

@@ -139,7 +139,9 @@ define(
                 type = domainObject.getCapability("type"),
                 typeRequest = (type && type.getDefinition().telemetry) || {},
                 modelTelemetry = domainObject.getModel().telemetry,
-                fullRequest = Object.create(typeRequest);
+                fullRequest = Object.create(typeRequest),
+                bounds,
+                timeSystem;
 
             // Add properties from the telemetry field of this
             // specific domain object.
@@ -160,6 +162,19 @@ define(
                 fullRequest.key = domainObject.getId();
             }
 
+            if (request.start === undefined && request.end === undefined) {
+                bounds = this.openmct.conductor.bounds();
+                fullRequest.start = bounds.start;
+                fullRequest.end = bounds.end;
+            }
+
+            if (request.domain === undefined) {
+                timeSystem = this.openmct.conductor.timeSystem();
+                if (timeSystem !== undefined) {
+                    fullRequest.domain = timeSystem.metadata.key;
+                }
+            }
+
             return fullRequest;
         };
 

platform/telemetry/src/TelemetryCapability.js

@@ -97,7 +97,22 @@ define(
                 });
 
                 mockAPI = {
-                    telemetry: mockTelemetryAPI
+                    telemetry: mockTelemetryAPI,
+                    conductor: {
+                        bounds: function () {
+                            return {
+                                start: 0,
+                                end: 1
+                            };
+                        },
+                        timeSystem: function () {
+                            return {
+                                metadata: {
+                                    key: 'mockTimeSystem'
+                                }
+                            };
+                        }
+                    }
                 };
 
                 telemetry = new TelemetryCapability(
@@ -133,7 +148,8 @@ define(
                         id: "testId", // from domain object
                         source: "testSource", // from model
                         key: "testKey", // from model
-                        start: 42 // from argument
+                        start: 42, // from argument
+                        domain: 'mockTimeSystem'
                     }]);
             });
 
@@ -150,7 +166,10 @@ define(
                 expect(telemetry.getMetadata()).toEqual({
                     id: "testId", // from domain object
                     source: "testSource",
-                    key: "testKey"
+                    key: "testKey",
+                    start: 0,
+                    end: 1,
+                    domain: 'mockTimeSystem'
                 });
             });
 
@@ -164,7 +183,10 @@ define(
                 expect(telemetry.getMetadata()).toEqual({
                     id: "testId", // from domain object
                     source: "testSource", // from model
-                    key: "testId" // from domain object
+                    key: "testId", // from domain object
+                    start: 0,
+                    end: 1,
+                    domain: 'mockTimeSystem'
                 });
             });
 
@@ -243,7 +265,10 @@ define(
                     [{
                         id: "testId", // from domain object
                         source: "testSource",
-                        key: "testKey"
+                        key: "testKey",
+                        start: 0,
+                        end: 1,
+                        domain: 'mockTimeSystem'
                     }]
                 );
 
@@ -260,8 +285,28 @@ define(
                 expect(mockUnsubscribe).not.toHaveBeenCalled();
                 subscription(); // should be an unsubscribe function
                 expect(mockUnsubscribe).toHaveBeenCalled();
+            });
+
+            it("applies time conductor bounds if request bounds not defined", function () {
+                var fullRequest = telemetry.buildRequest({});
+                var mockBounds = mockAPI.conductor.bounds();
+
+                expect(fullRequest.start).toBe(mockBounds.start);
+                expect(fullRequest.end).toBe(mockBounds.end);
+
+                fullRequest = telemetry.buildRequest({start: 10, end: 20});
+
+                expect(fullRequest.start).toBe(10);
+                expect(fullRequest.end).toBe(20);
+            });
 
+            it("applies domain from time system if none defined", function () {
+                var fullRequest = telemetry.buildRequest({});
+                var mockTimeSystem = mockAPI.conductor.timeSystem();
+                expect(fullRequest.domain).toBe(mockTimeSystem.metadata.key);
 
+                fullRequest = telemetry.buildRequest({domain: 'someOtherDomain'});
+                expect(fullRequest.domain).toBe('someOtherDomain');
             });
         });
     }