From 26e13a6cd0eba1a7439fc4403032c77dd09f3772 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 26 Apr 2017 21:15:48 -0700 Subject: [PATCH 1/2] [Telemetry] Use the 'source' metadata field to retrieve telemetry metadata, if available. Fixes #1543. --- platform/telemetry/src/TelemetryCapability.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/telemetry/src/TelemetryCapability.js b/platform/telemetry/src/TelemetryCapability.js index 37a4e0f2ed..1c1735b328 100644 --- a/platform/telemetry/src/TelemetryCapability.js +++ b/platform/telemetry/src/TelemetryCapability.js @@ -212,8 +212,10 @@ define( 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 domainMetadata = metadata.valuesForHints(['x'])[0] || {}; + var rangeMetadata = metadata.valuesForHints(['y'])[0] || {}; + var defaultDomain = domainMetadata.source || domainMetadata.key; + var defaultRange = rangeMetadata.source || rangeMetadata.key; var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject) === telemetryAPI.legacyProvider; From fce8f13984b77cec11541bccfe116ce7a6144050 Mon Sep 17 00:00:00 2001 From: Pete Richards Date: Thu, 27 Apr 2017 13:43:54 -0700 Subject: [PATCH 2/2] Remove check for invalid return, update spec Remove a check for an invalid return value, update the spec to return the proper value. Also updated the subscribe method to fetch defaults the same as the request method. https://github.com/nasa/openmct/pull/1544 --- platform/telemetry/src/TelemetryCapability.js | 10 ++++------ platform/telemetry/test/TelemetryCapabilitySpec.js | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/platform/telemetry/src/TelemetryCapability.js b/platform/telemetry/src/TelemetryCapability.js index 1c1735b328..4cc0992e16 100644 --- a/platform/telemetry/src/TelemetryCapability.js +++ b/platform/telemetry/src/TelemetryCapability.js @@ -212,10 +212,8 @@ define( var telemetryAPI = this.openmct.telemetry; var metadata = telemetryAPI.getMetadata(domainObject); - var domainMetadata = metadata.valuesForHints(['x'])[0] || {}; - var rangeMetadata = metadata.valuesForHints(['y'])[0] || {}; - var defaultDomain = domainMetadata.source || domainMetadata.key; - var defaultRange = rangeMetadata.source || rangeMetadata.key; + var defaultDomain = metadata.valuesForHints(['x'])[0].source; + var defaultRange = metadata.valuesForHints(['y'])[0].source; var isLegacyProvider = telemetryAPI.findRequestProvider(domainObject) === telemetryAPI.legacyProvider; @@ -276,8 +274,8 @@ define( 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 defaultDomain = metadata.valuesForHints(['x'])[0].source; + var defaultRange = metadata.valuesForHints(['y'])[0].source; var isLegacyProvider = telemetryAPI.findSubscriptionProvider(domainObject) === telemetryAPI.legacyProvider; diff --git a/platform/telemetry/test/TelemetryCapabilitySpec.js b/platform/telemetry/test/TelemetryCapabilitySpec.js index 3e0be09f77..5459972998 100644 --- a/platform/telemetry/test/TelemetryCapabilitySpec.js +++ b/platform/telemetry/test/TelemetryCapabilitySpec.js @@ -92,7 +92,7 @@ define( ]); mockTelemetryAPI.getMetadata.andReturn({ valuesForHints: function () { - return []; + return [{}]; } });