From 78b885c508e51882cf75e243534c2e5d6e761861 Mon Sep 17 00:00:00 2001 From: Joel McKinnon Date: Tue, 14 Jan 2020 13:44:19 -0800 Subject: [PATCH] using current condition output for current output label --- src/plugins/condition/Condition.js | 2 ++ .../components/ConditionCollection.vue | 6 +++-- .../condition/components/ConditionEdit.vue | 16 +++++++++++-- .../condition/components/ConditionSet.vue | 23 +++++++++++++++---- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/plugins/condition/Condition.js b/src/plugins/condition/Condition.js index 21eec8fbe8..1666c8ccb5 100644 --- a/src/plugins/condition/Condition.js +++ b/src/plugins/condition/Condition.js @@ -47,6 +47,7 @@ export default class ConditionClass extends EventEmitter { this.name = conditionDefinition.name; this.description = conditionDefinition.description; this.isDefault = conditionDefinition.isDefault; + this.isCurrent = conditionDefinition.isCurrent; if (conditionDefinition.criteria) { this.createCriteria(conditionDefinition.criteria, openmct); } else { @@ -54,6 +55,7 @@ export default class ConditionClass extends EventEmitter { } this.trigger = conditionDefinition.trigger; this.result = null; + this.output = conditionDefinition.output } updateTrigger(conditionDefinition) { diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue index 81bcf36a3f..fe7042ccb7 100644 --- a/src/plugins/condition/components/ConditionCollection.vue +++ b/src/plugins/condition/components/ConditionCollection.vue @@ -48,7 +48,7 @@