Merge branch 'topic-conditionals' into fix-enum-metadata

This commit is contained in:
David Tsay 2020-03-19 20:15:05 -07:00
commit 1f3ec77bf1

View File

@ -34,8 +34,10 @@
</div>
</section>
<TestData :is-editing="isEditing" />
<ConditionCollection :is-editing="isEditing"
@conditionSetResultUpdated="updateCurrentOutput" />
<ConditionCollection
:is-editing="isEditing"
@conditionSetResultUpdated="updateCurrentOutput"
/>
</div>
</template>
@ -60,11 +62,6 @@ export default {
mounted() {
this.conditionSetIdentifier = this.openmct.objects.makeKeyString(this.domainObject.identifier);
},
beforeDestroy() {
if (this.stopProvidingTelemetry) {
this.stopProvidingTelemetry();
}
},
methods: {
updateCurrentOutput(currentConditionResult) {
this.currentConditionOutput = currentConditionResult.output;