From 460ea6d6ceaf96bbc064451403e1fec9b3f124cd Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 9 Jan 2020 08:25:37 +0100
Subject: Filter disabled operations out of the rule list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/workflowengine/src/store.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apps/workflowengine/src')

diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js
index c02aa99f63a..79524ab4514 100644
--- a/apps/workflowengine/src/store.js
+++ b/apps/workflowengine/src/store.js
@@ -138,7 +138,7 @@ const store = new Vuex.Store({
 	},
 	getters: {
 		getRules(state) {
-			return state.rules.sort((rule1, rule2) => {
+			return state.rules.filter((rule) => typeof state.operations[rule.class] !== 'undefined').sort((rule1, rule2) => {
 				return rule1.id - rule2.id || rule2.class - rule1.class
 			})
 		},
-- 
cgit v1.2.3


From d1a81a0225c326c91ee2e09167055d6f98924560 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 9 Jan 2020 08:45:41 +0100
Subject: Fallback to proper default values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/workflowengine/src/components/Check.vue | 1 +
 apps/workflowengine/src/components/Rule.vue  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'apps/workflowengine/src')

diff --git a/apps/workflowengine/src/components/Check.vue b/apps/workflowengine/src/components/Check.vue
index c15907852e8..cfd0f034adf 100644
--- a/apps/workflowengine/src/components/Check.vue
+++ b/apps/workflowengine/src/components/Check.vue
@@ -121,6 +121,7 @@ export default {
 			this.deleteVisible = false
 		},
 		validate() {
+			this.valid = true
 			if (this.currentOption && this.currentOption.validate) {
 				this.valid = !!this.currentOption.validate(this.check)
 			}
diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue
index 7796180be6f..c6e23a8f180 100644
--- a/apps/workflowengine/src/components/Rule.vue
+++ b/apps/workflowengine/src/components/Rule.vue
@@ -19,7 +19,7 @@
 					type="button"
 					class="check--add"
 					value="Add a new filter"
-					@click="rule.checks.push({class: null, operator: null, value: null})">
+					@click="rule.checks.push({class: null, operator: null, value: ''})">
 			</p>
 		</div>
 		<div class="flow-icon icon-confirm" />
-- 
cgit v1.2.3