From b15c4a3a2ea0e561ed6e892a77bbb91d9335958b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 10 Oct 2019 11:01:49 +0200 Subject: [PATCH] Properly validate individual checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/workflowengine/src/components/Check.vue | 3 +-- apps/workflowengine/src/components/Rule.vue | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/workflowengine/src/components/Check.vue b/apps/workflowengine/src/components/Check.vue index 5f125772ea..2f0bc11d18 100644 --- a/apps/workflowengine/src/components/Check.vue +++ b/apps/workflowengine/src/components/Check.vue @@ -112,7 +112,6 @@ export default { if (this.currentOption && this.currentOption.validate) { this.valid = !!this.currentOption.validate(this.check); } - this.$store.dispatch('setValid', { rule: this.rule, valid: this.rule.valid && this.valid }) return this.valid }, updateCheck() { @@ -123,7 +122,7 @@ export default { this.check.operator = this.currentOperator.operator if (!this.validate()) { - return + this.check.invalid = !this.valid } this.$emit('update', this.check) } diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue index 2be9b0fc5e..2d3d5c8491 100644 --- a/apps/workflowengine/src/components/Rule.vue +++ b/apps/workflowengine/src/components/Rule.vue @@ -85,7 +85,7 @@ export default { return this.$store.getters.getOperationForRule(this.rule) }, ruleStatus() { - if (this.error || !this.rule.valid) { + if (this.error || !this.rule.valid || this.rule.checks.some((check) => check.invalid === true)) { return { title: t('workflowengine', 'The configuration is invalid'), class: 'icon-close-white invalid',