Progress on triggers UI

2 files changed, 21 insertions, 10 deletions

diff --git a/server/rulesHelper.js b/server/rulesHelper.js
index 4c2a1ef1..1a00688e 100644
--- a/server/rulesHelper.js
+++ b/server/rulesHelper.js
@@ -1,6 +1,4 @@
 RulesHelper = {
-
-
 	executeRules(activity){
 		const matchingRules = this.findMatchingRules(activity);
 		console.log(matchingRules);
@@ -33,7 +31,7 @@ RulesHelper = {
 		return matchingRules;
 	},
 	buildMatchingFieldsMap(activity, matchingFields){
-		let matchingMap = {};
+		let matchingMap = {"activityType":activity.activityType};
 		for(let i = 0;i< matchingFields.length;i++){
 			// Creating a matching map with the actual field of the activity
 			// and with the wildcard (for example: trigger when a card is added
diff --git a/server/triggersDef.js b/server/triggersDef.js
index 41136a78..fce7ff69 100644
--- a/server/triggersDef.js
+++ b/server/triggersDef.js
@@ -14,7 +14,7 @@ TriggersDef = {
 	joinMember:{
 		matchingFields: ["boardId","memberId"]
 	},
-	unJoinMember:{
+	unjoinMember:{
 		matchingFields: ["boardId","memberId"]
 	},
 	addChecklist:{
@@ -23,23 +23,36 @@ TriggersDef = {
 	removeChecklist:{
 		matchingFields: ["boardId","checklistId"]
 	},
-	addChecklistItem:{
+	completeChecklist:{
+		matchingFields: ["boardId","checklistId"]
+	},
+	uncompleteChecklist:{
+		matchingFields: ["boardId","checklistId"]
+	},
+	addedChecklistItem:{
+		matchingFields: ["boardId","checklistItemId"]
+	},
+	removedChecklistItem:{
 		matchingFields: ["boardId","checklistItemId"]
 	},
 	checkedItem:{
-		matchingFields: ["boardId","checklistId"]
+		matchingFields: ["boardId","checklistItemId"]
 	},
 	uncheckedItem:{
 		matchingFields: ["boardId","checklistItemId"]
 	},
 	addAttachment:{
-		matchingFields: ["boardId","checklistId"]
+		matchingFields: ["boardId"]
 	},
 	deleteAttachment:{
-		matchingFields: ["boardId","checklistItemId"]
+		matchingFields: ["boardId"]
+	},
+	addedLabel:{
+		matchingFields: ["boardId","labelId"]
+	},
+	removedLabel:{
+		matchingFields: ["boardId","labelId"]
 	}
-
-
 }