Finished alpha rules

4 files changed, 50 insertions, 43 deletions

diff --git a/client/components/rules/actions/boardActions.js b/client/components/rules/actions/boardActions.js
index d1593a5b..0394f601 100644
--- a/client/components/rules/actions/boardActions.js
+++ b/client/components/rules/actions/boardActions.js
@@ -13,47 +13,49 @@ BlazeComponent.extendComponent({
       const actionSelected = this.find('#move-spec-action').value;
       const listTitle = this.find('#listName').value;
       const boardId = Session.get('currentBoard');
-
+      const desc = Utils.getTriggerActionDesc(event,this);
       if(actionSelected == "top"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":listTitle,"boardId":boardId});
+       const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":listTitle,"boardId":boardId,"desc":desc});
        Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
      if(actionSelected == "bottom"){
        const triggerId = Triggers.insert(trigger);
-       const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":listTitle,"boardId":boardId});
+       const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":listTitle,"boardId":boardId,"desc":desc});
        Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
    },
    'click .js-add-gen-move-action'(event) {
+    const desc = Utils.getTriggerActionDesc(event,this);
     const boardId = Session.get('currentBoard');
     const ruleName = this.data().ruleName.get();
     const trigger = this.data().triggerVar.get();
     const actionSelected = this.find('#move-gen-action').value;
     if(actionSelected == "top"){
      const triggerId = Triggers.insert(trigger);
-     const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":"*","boardId":boardId});
+     const actionId = Actions.insert({actionType: "moveCardToTop","listTitle":"*","boardId":boardId,"desc":desc});
      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
    }
    if(actionSelected == "bottom"){
      const triggerId = Triggers.insert(trigger);
-     const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":"*","boardId":boardId});
+     const actionId = Actions.insert({actionType: "moveCardToBottom","listTitle":"*","boardId":boardId,"desc":desc});
      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
    }
  },
  'click .js-add-arch-action'(event) {
+  const desc = Utils.getTriggerActionDesc(event,this);
   const boardId = Session.get('currentBoard');
   const ruleName = this.data().ruleName.get();
   const trigger = this.data().triggerVar.get();
   const actionSelected = this.find('#arch-action').value;
   if(actionSelected == "archive"){
    const triggerId = Triggers.insert(trigger);
-   const actionId = Actions.insert({actionType: "archive","boardId":boardId});
+   const actionId = Actions.insert({actionType: "archive","boardId":boardId,"desc":desc});
    Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
  }
  if(actionSelected == "unarchive"){
    const triggerId = Triggers.insert(trigger);
-   const actionId = Actions.insert({actionType: "unarchive","boardId":boardId});
+   const actionId = Actions.insert({actionType: "unarchive","boardId":boardId,"desc":desc});
    Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
  }
 },
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
diff --git a/client/components/rules/actions/checklistActions.js b/client/components/rules/actions/checklistActions.js
index e6989fc6..bfc07623 100644
--- a/client/components/rules/actions/checklistActions.js
+++ b/client/components/rules/actions/checklistActions.js
@@ -10,15 +10,15 @@ BlazeComponent.extendComponent({
       const actionSelected = this.find('#check-action').value;
       const checklistName = this.find('#checklist-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: "addChecklist","checklistName":checklistName,"boardId":boardId});
+       const actionId = Actions.insert({actionType: "addChecklist","checklistName":checklistName,"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: "removeChecklist","checklistName":checklistName,"boardId":boardId});
+       const actionId = Actions.insert({actionType: "removeChecklist","checklistName":checklistName,"boardId":boardId,"desc":desc});
        Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
      }
 
@@ -29,14 +29,15 @@ BlazeComponent.extendComponent({
     const actionSelected = this.find('#checkall-action').value;
     const checklistName = this.find('#checklist-name2').value;
     const boardId = Session.get('currentBoard');
+    const desc = Utils.getTriggerActionDesc(event,this);
     if(actionSelected == "check"){
      const triggerId = Triggers.insert(trigger);
-     const actionId = Actions.insert({actionType: "checkAll","checklistName":checklistName,"boardId":boardId});
+     const actionId = Actions.insert({actionType: "checkAll","checklistName":checklistName,"boardId":boardId,"desc":desc});
      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
    }
    if(actionSelected == "uncheck"){
      const triggerId = Triggers.insert(trigger);
-     const actionId = Actions.insert({actionType: "uncheckAll","checklistName":checklistName,"boardId":boardId});
+     const actionId = Actions.insert({actionType: "uncheckAll","checklistName":checklistName,"boardId":boardId,"desc":desc});
      Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
    }
  },
@@ -47,14 +48,15 @@ BlazeComponent.extendComponent({
   const checklistName = this.find("#checklist-name3");
   const actionSelected = this.find('#check-item-action').value;
   const boardId = Session.get('currentBoard');
+  const desc = Utils.getTriggerActionDesc(event,this);
   if(actionSelected == "check"){
     const triggerId = Triggers.insert(trigger);
-    const actionId = Actions.insert({actionType: "checkItem","checklistName":checklistName,"checkItemName":checkItemName,"boardId":boardId});
+    const actionId = Actions.insert({actionType: "checkItem","checklistName":checklistName,"checkItemName":checkItemName,"boardId":boardId,"desc":desc});
     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
   }
   if(actionSelected == "uncheck"){
     const triggerId = Triggers.insert(trigger);
-    const actionId = Actions.insert({actionType: "uncheckItem","checklistName":checklistName,"checkItemName":checkItemName,"boardId":boardId});
+    const actionId = Actions.insert({actionType: "uncheckItem","checklistName":checklistName,"checkItemName":checkItemName,"boardId":boardId,"desc":desc});
     Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
   }
 },
diff --git a/client/components/rules/actions/mailActions.js b/client/components/rules/actions/mailActions.js
index 74f6659b..65b8a2d8 100644
--- a/client/components/rules/actions/mailActions.js
+++ b/client/components/rules/actions/mailActions.js
@@ -13,7 +13,8 @@ BlazeComponent.extendComponent({
       const ruleName = this.data().ruleName.get();
       const triggerId = Triggers.insert(trigger);
       const boardId = Session.get('currentBoard');
-      const actionId = Actions.insert({actionType: "sendEmail","emailTo":emailTo,"emailSubject":emailSubject,"emailMsg":emailMsg,"boardId":boardId});
+      const desc = Utils.getTriggerActionDesc(event,this);
+      const actionId = Actions.insert({actionType: "sendEmail","emailTo":emailTo,"emailSubject":emailSubject,"emailMsg":emailMsg,"boardId":boardId,"desc":desc});
       Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId});  
     },
   }];