diff --git a/src/plugins/condition/ConditionManager.js b/src/plugins/condition/ConditionManager.js index 97969be777..ac9cd92718 100644 --- a/src/plugins/condition/ConditionManager.js +++ b/src/plugins/condition/ConditionManager.js @@ -324,7 +324,7 @@ export default class ConditionManager extends EventEmitter { return currentCondition; } - getHistoricalData() { + getHistoricalData(options) { if (!this.conditionSetDomainObject.configuration.shouldFetchHistorical) { return []; } @@ -332,7 +332,8 @@ export default class ConditionManager extends EventEmitter { this.openmct, this.telemetryObjects, this.conditions, - this.conditionSetDomainObject + this.conditionSetDomainObject, + options ); return historicalTelemetry.getHistoricalData(); } diff --git a/src/plugins/condition/ConditionSetTelemetryProvider.js b/src/plugins/condition/ConditionSetTelemetryProvider.js index c45b13c22d..dc3e3a7240 100644 --- a/src/plugins/condition/ConditionSetTelemetryProvider.js +++ b/src/plugins/condition/ConditionSetTelemetryProvider.js @@ -42,7 +42,7 @@ export default class ConditionSetTelemetryProvider { async request(domainObject, options) { let conditionManager = this.getConditionManager(domainObject); - const formattedHistoricalData = await conditionManager.getHistoricalData(); + const formattedHistoricalData = await conditionManager.getHistoricalData(options); let latestOutput = await conditionManager.requestLADConditionSetOutput(options); return [...formattedHistoricalData, ...latestOutput]; } diff --git a/src/plugins/condition/historicalTelemetryProvider.js b/src/plugins/condition/historicalTelemetryProvider.js index 5913db10c1..c78ec58e03 100644 --- a/src/plugins/condition/historicalTelemetryProvider.js +++ b/src/plugins/condition/historicalTelemetryProvider.js @@ -1,5 +1,5 @@ export default class HistoricalTelemetryProvider { - constructor(openmct, telemetryObjects, conditions, conditionSetDomainObject) { + constructor(openmct, telemetryObjects, conditions, conditionSetDomainObject, options) { this.openmct = openmct; this.telemetryObjects = telemetryObjects; this.bounds = { start: null, end: null }; @@ -9,6 +9,7 @@ export default class HistoricalTelemetryProvider { this.historicalTelemetryPoolMap = new Map(); this.historicalTelemetryDateMap = new Map(); this.index = 0; + this.options = options; } setTimeBounds(bounds) { @@ -21,7 +22,7 @@ export default class HistoricalTelemetryProvider { domainObject = await this.openmct.objects.get(identifier); } const id = this.openmct.objects.makeKeyString(domainObject.identifier); - const telemetryOptions = { ...this.bounds }; + const telemetryOptions = { ...this.bounds, ...this.options }; const historicalTelemetry = await this.openmct.telemetry.request( domainObject, telemetryOptions