ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-11 21:13:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[VIPEROMCT-41] When new telemetry data arrives, don't evaluate criteria that are defined for a different telemtry endpoint. (#3797)

Browse Source
This commit is contained in:
Shefali Joshi 2021-04-20 14:51:44 -07:00 committed by GitHub
parent 1b57999059
commit 721bdd737a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/condition/Condition.js
View File

@ -82,7 +82,9 @@ export default class Condition extends EventEmitter {
if (this.isAnyOrAllTelemetry(criterion)) { if (this.isAnyOrAllTelemetry(criterion)) {
criterion.updateResult(datum, this.conditionManager.telemetryObjects); criterion.updateResult(datum, this.conditionManager.telemetryObjects);
} else { } else {
criterion.updateResult(datum); if (criterion.usesTelemetry(datum.id)) {
criterion.updateResult(datum);
}
} }
}); });
@ -102,7 +104,7 @@ export default class Condition extends EventEmitter {
isTelemetryUsed(id) { isTelemetryUsed(id) {
return this.criteria.some(criterion => { return this.criteria.some(criterion => {
return this.isAnyOrAllTelemetry(criterion) || criterion.telemetryObjectIdAsString === id; return this.isAnyOrAllTelemetry(criterion) || criterion.usesTelemetry(id);
}); });
} }

4
src/plugins/condition/criterion/TelemetryCriterion.js
View File

@ -58,6 +58,10 @@ export default class TelemetryCriterion extends EventEmitter {
} }
} }
usesTelemetry(id) {
return this.telemetryObjectIdAsString && (this.telemetryObjectIdAsString === id);
}
subscribeForStaleData() { subscribeForStaleData() {
if (this.stalenessSubscription) { if (this.stalenessSubscription) {
this.stalenessSubscription.clear(); this.stalenessSubscription.clear();