From a5d9fe9db35be55102ee4278cf8f7988e361e14c Mon Sep 17 00:00:00 2001 From: Shefali Date: Mon, 14 Aug 2023 10:53:53 -0700 Subject: [PATCH 1/2] Send in the timeContext for requests --- src/plugins/condition/criterion/AllTelemetryCriterion.js | 4 +++- src/plugins/condition/criterion/TelemetryCriterion.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/plugins/condition/criterion/AllTelemetryCriterion.js b/src/plugins/condition/criterion/AllTelemetryCriterion.js index 94738f1bccf..92039f49079 100644 --- a/src/plugins/condition/criterion/AllTelemetryCriterion.js +++ b/src/plugins/condition/criterion/AllTelemetryCriterion.js @@ -201,9 +201,11 @@ export default class AllTelemetryCriterion extends TelemetryCriterion { } requestLAD(telemetryObjects, requestOptions) { + //We pass in the global time context here let options = { strategy: 'latest', - size: 1 + size: 1, + timeContext: this.openmct.time.getContextForView([]) }; if (requestOptions !== undefined) { diff --git a/src/plugins/condition/criterion/TelemetryCriterion.js b/src/plugins/condition/criterion/TelemetryCriterion.js index 72df33fd5a0..94e408ead73 100644 --- a/src/plugins/condition/criterion/TelemetryCriterion.js +++ b/src/plugins/condition/criterion/TelemetryCriterion.js @@ -189,9 +189,11 @@ export default class TelemetryCriterion extends EventEmitter { } requestLAD(telemetryObjects, requestOptions) { + //We pass in the global time context here let options = { strategy: 'latest', - size: 1 + size: 1, + timeContext: this.openmct.time.getContextForView([]) }; if (requestOptions !== undefined) { From 86da66dfb0904f5931970a588f62eff21cc960c2 Mon Sep 17 00:00:00 2001 From: Shefali Date: Tue, 15 Aug 2023 09:28:19 -0700 Subject: [PATCH 2/2] Fix failing test --- src/plugins/condition/criterion/TelemetryCriterionSpec.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/condition/criterion/TelemetryCriterionSpec.js b/src/plugins/condition/criterion/TelemetryCriterionSpec.js index 0438b76ad5f..f3b37e2aa56 100644 --- a/src/plugins/condition/criterion/TelemetryCriterionSpec.js +++ b/src/plugins/condition/criterion/TelemetryCriterionSpec.js @@ -83,13 +83,19 @@ describe('The telemetry criterion', function () { }); openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry); - openmct.time = jasmine.createSpyObj('timeAPI', ['timeSystem', 'bounds', 'getAllTimeSystems']); + openmct.time = jasmine.createSpyObj('timeAPI', [ + 'timeSystem', + 'bounds', + 'getAllTimeSystems', + 'getContextForView' + ]); openmct.time.timeSystem.and.returnValue({ key: 'system' }); openmct.time.bounds.and.returnValue({ start: 0, end: 1 }); openmct.time.getAllTimeSystems.and.returnValue([{ key: 'system' }]); + openmct.time.getContextForView.and.returnValue({}); testCriterionDefinition = { id: 'test-criterion-id',