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

Merge remote-tracking branch 'khalidadil/extend-conditional' into combined-rodap-stuff

Browse Source
This commit is contained in:
Scott Bell 2024-10-03 17:53:59 +02:00
commit abc4213874
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/condition/ConditionManager.js
View File

@ -328,14 +328,16 @@ export default class ConditionManager extends EventEmitter {
if (!this.conditionSetDomainObject.configuration.shouldFetchHistorical) { if (!this.conditionSetDomainObject.configuration.shouldFetchHistorical) {
return []; return [];
} }
const historicalTelemetry = new HistoricalTelemetryProvider( let historicalTelemetry = new HistoricalTelemetryProvider(
this.openmct, this.openmct,
this.telemetryObjects, this.telemetryObjects,
this.conditions, this.conditions,
this.conditionSetDomainObject, this.conditionSetDomainObject,
options options
); );
return historicalTelemetry.getHistoricalData(); const historicalData = historicalTelemetry.getHistoricalData();
historicalTelemetry = null;
return historicalData;
} }
getCurrentConditionLAD(conditionResults) { getCurrentConditionLAD(conditionResults) {
@ -430,18 +432,6 @@ export default class ConditionManager extends EventEmitter {
} }
} }
const conditionTelemetries = [];
const conditions = this.conditionSetDomainObject.configuration.conditionCollection;
conditions.forEach((condition) => {
if (condition?.configuration?.outputTelemetry) {
conditionTelemetries.push(condition?.configuration?.outputTelemetry);
}
});
if (conditionTelemetries.includes(id)) {
return true;
}
return false; return false;
} }

10
src/plugins/condition/components/ConditionItem.vue
View File

@ -113,7 +113,7 @@
@change="persist" @change="persist"
/> />
</span> </span>
<span v-if="selectedOutputSelection === TELEMETRY_VALUE" class="c-cdef__control"> <span v-if="selectedOutputSelection === telemetryValueString" class="c-cdef__control">
<select <select
v-model="condition.configuration.outputTelemetry" v-model="condition.configuration.outputTelemetry"
aria-label="Output Telemetry Selection" aria-label="Output Telemetry Selection"
@ -289,6 +289,7 @@ export default {
expanded: true, expanded: true,
trigger: 'all', trigger: 'all',
selectedOutputSelection: '', selectedOutputSelection: '',
telemetryValueString: TELEMETRY_VALUE,
outputOptions: ['none', 'false', 'true', 'string', TELEMETRY_VALUE], outputOptions: ['none', 'false', 'true', 'string', TELEMETRY_VALUE],
criterionIndex: 0, criterionIndex: 0,
draggingOver: false, draggingOver: false,
@ -337,10 +338,11 @@ export default {
}, },
deep: true deep: true
}, },
isEditing(newValue, oldValue) { telemetry: {
if (newValue === true) { handler() {
this.initializeMetadata(); this.initializeMetadata();
} },
deep: true
} }
}, },
unmounted() { unmounted() {

2
src/plugins/condition/historicalTelemetryProvider.js
View File

@ -41,7 +41,7 @@ export default class HistoricalTelemetryProvider {
const outputTelemetryID = this.openmct.objects.makeKeyString(outputTelemetry); const outputTelemetryID = this.openmct.objects.makeKeyString(outputTelemetry);
const outputTelemetryData = telemetryData.get(outputTelemetryID); const outputTelemetryData = telemetryData.get(outputTelemetryID);
output.telemetry = outputTelemetryData; output.telemetry = outputTelemetryData;
output.value = outputTelemetryData[outputMetadata]; output.value = outputTelemetryData?.[outputMetadata] || undefined;
output.condition = condition; output.condition = condition;
} else if (conditionConfiguration?.output) { } else if (conditionConfiguration?.output) {
output.telemetry = null; output.telemetry = null;