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

src/plugins/condition/ConditionManager.js

@@ -328,14 +328,16 @@ export default class ConditionManager extends EventEmitter {
     if (!this.conditionSetDomainObject.configuration.shouldFetchHistorical) {
       return [];
     }
-    const historicalTelemetry = new HistoricalTelemetryProvider(
+    let historicalTelemetry = new HistoricalTelemetryProvider(
       this.openmct,
       this.telemetryObjects,
       this.conditions,
       this.conditionSetDomainObject,
       options
     );
-    return historicalTelemetry.getHistoricalData();
+    const historicalData = historicalTelemetry.getHistoricalData();
+    historicalTelemetry = null;
+    return historicalData;
   }
 
   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;
   }
 

src/plugins/condition/components/ConditionItem.vue

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

src/plugins/condition/historicalTelemetryProvider.js

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