Finished alpha rules

1 files changed, 30 insertions, 28 deletions

diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js
index 3f4b4442..0bf7428a 100644
--- a/client/components/rules/actions/cardActions.js
+++ b/client/components/rules/actions/cardActions.js
@@ -24,45 +24,47 @@ BlazeComponent.extendComponent({
       const actionSelected = this.find('#label-action').value;
       const labelId = this.find('#label-id').value;
       const boardId = Session.get('currentBoard');
-
+      const desc = Utils.getTriggerActionDesc(event,this);
       if(actionSelected == "add"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "addLabel","labelId":labelId,"boardId":boardId});
+       const actionId = Actions.insert({actionType: "addLabel","labelId":labelId,"boardId":boardId,"desc":desc});
        Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
      if(actionSelected == "remove"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "removeLabel","labelId":labelId,"boardId":boardId});
+       const actionId = Actions.insert({actionType: "removeLabel","labelId":labelId,"boardId":boardId,"desc":desc});
        Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
 
    },
    'click .js-add-member-action'(event) {
-      const ruleName = this.data().ruleName.get();
-      const trigger = this.data().triggerVar.get();
-      const actionSelected = this.find('#member-action').value;
-      const memberName = this.find('#member-name').value;
-      const boardId = Session.get('currentBoard');
-      if(actionSelected == "add"){
-       const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "addMember","memberName":memberName,"boardId":boardId});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
-     }
-     if(actionSelected == "remove"){
-       const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "removeMember","memberName":memberName,"boardId":boardId});
-       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
-     }
-   },
-   'click .js-add-removeall-action'(event) {
-      const ruleName = this.data().ruleName.get();
-      const trigger = this.data().triggerVar.get();
-      const triggerId = Triggers.insert(trigger);
-      const boardId = Session.get('currentBoard');
-      const actionId = Actions.insert({actionType: "removeMember","memberName":"*","boardId":boardId});
-      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});
-   },
- }];
+    const ruleName = this.data().ruleName.get();
+    const trigger = this.data().triggerVar.get();
+    const actionSelected = this.find('#member-action').value;
+    const memberName = this.find('#member-name').value;
+    const boardId = Session.get('currentBoard');
+    const desc = Utils.getTriggerActionDesc(event,this);
+    if(actionSelected == "add"){
+     const triggerId = Triggers.insert(trigger);
+     const actionId = Actions.insert({actionType: "addMember","memberName":memberName,"boardId":boardId,"desc":desc});
+     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId,"desc":desc});  
+   }
+   if(actionSelected == "remove"){
+     const triggerId = Triggers.insert(trigger);
+     const actionId = Actions.insert({actionType: "removeMember","memberName":memberName,"boardId":boardId,"desc":desc});
+     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
+   }
+ },
+ 'click .js-add-removeall-action'(event) {
+  const ruleName = this.data().ruleName.get();
+  const trigger = this.data().triggerVar.get();
+  const triggerId = Triggers.insert(trigger);
+  const desc = Utils.getTriggerActionDesc(event,this);
+  const boardId = Session.get('currentBoard');
+  const actionId = Actions.insert({actionType: "removeMember","memberName":"*","boardId":boardId,"desc":desc});
+  Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});
+},
+}];
 },
 
 }).register('cardActions');
\ No newline at end of file