2
0
Angelo Gallarello 6 жил өмнө
parent
commit
4d8b2029d2

+ 2 - 2
client/components/rules/actions/boardActions.js

@@ -28,7 +28,7 @@ BlazeComponent.extendComponent({
           actionId,
           boardId,
         });
-        
+
       },
       'click .js-add-swimlane-action' (event) {
         const ruleName = this.data().ruleName.get();
@@ -49,7 +49,7 @@ BlazeComponent.extendComponent({
           actionId,
           boardId,
         });
-        
+
       },
       'click .js-add-spec-move-action' (event) {
         const ruleName = this.data().ruleName.get();

+ 1 - 1
client/components/rules/actions/checklistActions.js

@@ -25,7 +25,7 @@ BlazeComponent.extendComponent({
           actionId,
           boardId,
         });
-        
+
       },
       'click .js-add-checklist-action' (event) {
         const ruleName = this.data().ruleName.get();

+ 10 - 11
client/components/rules/rulesMain.js

@@ -1,4 +1,4 @@
-let rulesMainComponent = BlazeComponent.extendComponent({
+const rulesMainComponent = BlazeComponent.extendComponent({
   onCreated() {
     this.rulesCurrentTab = new ReactiveVar('rulesList');
     this.ruleName = new ReactiveVar('');
@@ -10,9 +10,9 @@ let rulesMainComponent = BlazeComponent.extendComponent({
     this.rulesCurrentTab.set('trigger');
   },
   sanitizeObject(obj){
-    Object.keys(obj).forEach(key =>{
-      if(obj[key] == "" || obj[key] == undefined){
-        obj[key] = "*";
+    Object.keys(obj).forEach((key) => {
+      if(obj[key] == '' || obj[key] == undefined){
+        obj[key] = '*';
       }}
     );
   },
@@ -49,25 +49,25 @@ let rulesMainComponent = BlazeComponent.extendComponent({
       'click .js-goto-action' (event) {
         event.preventDefault();
         // Add user to the trigger
-        const username = $(event.currentTarget.offsetParent).find(".user-name").val();
+        const username = $(event.currentTarget.offsetParent).find('.user-name').val();
         let trigger = this.triggerVar.get();
-        trigger["userId"] = "*";
+        trigger.userId = '*';
         if(username != undefined ){
-          const userFound = Users.findOne({"username":username});
+          const userFound = Users.findOne({username});
           if(userFound != undefined){
-            trigger["userId"] = userFound._id;
+            trigger.userId = userFound._id;
             this.triggerVar.set(trigger);
           }
         }
         // Sanitize trigger
         trigger = this.triggerVar.get();
-        this.sanitizeObject(trigger)
+        this.sanitizeObject(trigger);
         this.triggerVar.set(trigger);
         this.setAction();
       },
       'click .js-show-user-field' (event) {
         event.preventDefault();
-        $(event.currentTarget.offsetParent).find(".user-details").removeClass("hide-element");
+        $(event.currentTarget.offsetParent).find('.user-details').removeClass('hide-element');
       },
       'click .js-goto-rules' (event) {
         event.preventDefault();
@@ -95,4 +95,3 @@ let rulesMainComponent = BlazeComponent.extendComponent({
 }).register('rulesMain');
 
 
-

+ 13 - 16
client/components/rules/triggers/boardTriggers.js

@@ -1,7 +1,7 @@
 BlazeComponent.extendComponent({
   onCreated() {
     this.provaVar = new ReactiveVar('');
-    this.currentPopupTriggerId = "def";
+    this.currentPopupTriggerId = 'def';
     this.cardTitleFilters = {};
   },
   setNameFilter(name){
@@ -11,12 +11,12 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       'click .js-open-card-title-popup'(event){
-        var funct = Popup.open('boardCardTitle');
-        let divId = $(event.currentTarget.parentNode.parentNode).attr("id");
-        console.log("current popup");
+        const funct = Popup.open('boardCardTitle');
+        const divId = $(event.currentTarget.parentNode.parentNode).attr('id');
+        console.log('current popup');
         console.log(this.currentPopupTriggerId);
         this.currentPopupTriggerId = divId;
-        funct.call(this,event);
+        funct.call(this, event);
       },
       'click .js-add-create-trigger' (event) {
         const desc = Utils.getTriggerActionDesc(event, this);
@@ -24,17 +24,17 @@ BlazeComponent.extendComponent({
         const listName = this.find('#create-list-name').value;
         const swimlaneName = this.find('#create-swimlane-name').value;
         const boardId = Session.get('currentBoard');
-        const divId = $(event.currentTarget.parentNode).attr("id");
+        const divId = $(event.currentTarget.parentNode).attr('id');
         const cardTitle = this.cardTitleFilters[divId];
         // move to generic funciont
         datas.triggerVar.set({
-            activityType: 'createCard',
-            boardId,
-            cardTitle,
-            swimlaneName,
-            listName,
-            desc,
-          });
+          activityType: 'createCard',
+          boardId,
+          cardTitle,
+          swimlaneName,
+          listName,
+          desc,
+        });
       },
       'click .js-add-moved-trigger' (event) {
         const datas = this.data();
@@ -105,9 +105,6 @@ BlazeComponent.extendComponent({
 }).register('boardTriggers');
 
 
-
-
-
 Template.boardCardTitlePopup.events({
   submit(evt, tpl) {
     const title = tpl.$('.js-card-filter-name').val().trim();

+ 6 - 6
client/lib/utils.js

@@ -220,19 +220,19 @@ Utils = {
         finalString += element.text().toLowerCase();
       } else if (element.hasClass('user-details')) {
         let username = element.find('input').val();
-        if(username == undefined || username == ""){
-          username = "*";
+        if(username == undefined || username == ''){
+          username = '*';
         }
-        finalString += element.find('.trigger-text').text().toLowerCase()+ " " + username ;
+        finalString += `${element.find('.trigger-text').text().toLowerCase() } ${  username}`;
       } else if (element.find('select').length > 0) {
         finalString += element.find('select option:selected').text().toLowerCase();
       } else if (element.find('input').length > 0) {
         let inputvalue = element.find('input').val();
-        if(inputvalue == undefined || inputvalue == ""){
-          inputvalue = "*";
+        if(inputvalue == undefined || inputvalue == ''){
+          inputvalue = '*';
         }
         finalString += inputvalue;
-      } 
+      }
       // Add space
       if (i !== length - 1) {
         finalString += ' ';

+ 10 - 10
server/rulesHelper.js

@@ -135,32 +135,32 @@ RulesHelper = {
     if(action.actionType === 'addSwimlane'){
       Swimlanes.insert({
         title: action.swimlaneName,
-        boardId
+        boardId,
       });
     }
     if(action.actionType === 'addChecklistWithItems'){
-       const checkListId = Checklists.insert({'title':action.checklistName, 'cardId':card._id, 'sort':0});
-       const itemsArray = action.checklistItems.split(',');
-       for(let i = 0;i <itemsArray.length;i++){
-        ChecklistItems.insert({title:itemsArray[i],checklistId:checkListId,cardId:card._id,'sort':0});
-       }
+      const checkListId = Checklists.insert({'title':action.checklistName, 'cardId':card._id, 'sort':0});
+      const itemsArray = action.checklistItems.split(',');
+      for(let i = 0; i <itemsArray.length; i++){
+        ChecklistItems.insert({title:itemsArray[i], checklistId:checkListId, cardId:card._id, 'sort':0});
+      }
     }
     if(action.actionType === 'createCard'){
-      let list = Lists.findOne({title:action.listName,boardId});
+      const list = Lists.findOne({title:action.listName, boardId});
       let listId = '';
       let swimlaneId = '';
-      let swimlane = Swimlanes.findOne({title:action.swimlaneName,boardId});
+      const swimlane = Swimlanes.findOne({title:action.swimlaneName, boardId});
       if(list == undefined){
         listId = '';
       }else{
         listId = list._id;
       }
       if(swimlane == undefined){
-        swimlaneId = Swimlanes.findOne({title:"Default",boardId})._id;
+        swimlaneId = Swimlanes.findOne({title:'Default', boardId})._id;
       }else{
         swimlaneId = swimlane._id;
       }
-      Cards.insert({title:action.cardName,listId,swimlaneId,sort:0,boardId});
+      Cards.insert({title:action.cardName, listId, swimlaneId, sort:0, boardId});
     }
 
   },

+ 18 - 18
server/triggersDef.js

@@ -1,57 +1,57 @@
 TriggersDef = {
   createCard:{
-    matchingFields: ['boardId', 'listName','userId','swimlaneName','cardTitle'],
+    matchingFields: ['boardId', 'listName', 'userId', 'swimlaneName', 'cardTitle'],
   },
   moveCard:{
-    matchingFields: ['boardId', 'listName', 'oldListName','userId','swimlaneName'],
+    matchingFields: ['boardId', 'listName', 'oldListName', 'userId', 'swimlaneName'],
   },
   archivedCard:{
-    matchingFields: ['boardId','userId'],
+    matchingFields: ['boardId', 'userId'],
   },
   restoredCard:{
-    matchingFields: ['boardId','userId'],
+    matchingFields: ['boardId', 'userId'],
   },
   joinMember:{
-    matchingFields: ['boardId', 'username','userId'],
+    matchingFields: ['boardId', 'username', 'userId'],
   },
   unjoinMember:{
-    matchingFields: ['boardId', 'username','userId'],
+    matchingFields: ['boardId', 'username', 'userId'],
   },
   addChecklist:{
-    matchingFields: ['boardId', 'checklistName','userId'],
+    matchingFields: ['boardId', 'checklistName', 'userId'],
   },
   removeChecklist:{
-    matchingFields: ['boardId', 'checklistName','userId'],
+    matchingFields: ['boardId', 'checklistName', 'userId'],
   },
   completeChecklist:{
-    matchingFields: ['boardId', 'checklistName','userId'],
+    matchingFields: ['boardId', 'checklistName', 'userId'],
   },
   uncompleteChecklist:{
-    matchingFields: ['boardId', 'checklistName','userId'],
+    matchingFields: ['boardId', 'checklistName', 'userId'],
   },
   addedChecklistItem:{
-    matchingFields: ['boardId', 'checklistItemName','userId'],
+    matchingFields: ['boardId', 'checklistItemName', 'userId'],
   },
   removedChecklistItem:{
-    matchingFields: ['boardId', 'checklistItemName','userId'],
+    matchingFields: ['boardId', 'checklistItemName', 'userId'],
   },
   checkedItem:{
-    matchingFields: ['boardId', 'checklistItemName','userId'],
+    matchingFields: ['boardId', 'checklistItemName', 'userId'],
   },
   uncheckedItem:{
-    matchingFields: ['boardId', 'checklistItemName','userId'],
+    matchingFields: ['boardId', 'checklistItemName', 'userId'],
   },
   addAttachment:{
-    matchingFields: ['boardId','userId'],
+    matchingFields: ['boardId', 'userId'],
   },
   deleteAttachment:{
-    matchingFields: ['boardId','userId'],
+    matchingFields: ['boardId', 'userId'],
   },
   addedLabel:{
-    matchingFields: ['boardId', 'labelId','userId'],
+    matchingFields: ['boardId', 'labelId', 'userId'],
   },
   removedLabel:{
-    matchingFields: ['boardId', 'labelId','userId'],
+    matchingFields: ['boardId', 'labelId', 'userId'],
   },
 };