From 25da8376ca2ee3b7bedadf924557d4d7bb6c6771 Mon Sep 17 00:00:00 2001 From: Angelo Gallarello Date: Fri, 14 Sep 2018 17:39:37 +0200 Subject: [PATCH] Beautyfied --- .../components/rules/actions/boardActions.js | 170 +++++++++----- .../components/rules/actions/cardActions.js | 155 +++++++----- .../rules/actions/checklistActions.js | 178 +++++++++----- .../components/rules/actions/mailActions.js | 42 ++-- client/components/rules/ruleDetails.js | 33 ++- client/components/rules/rulesActions.js | 37 +-- client/components/rules/rulesList.js | 6 +- client/components/rules/rulesMain.js | 68 +++--- client/components/rules/rulesTriggers.js | 29 +-- .../rules/triggers/boardTriggers.js | 140 +++++++---- .../rules/triggers/checklistTriggers.js | 220 +++++++++++------- client/lib/utils.js | 52 ++--- models/actions.js | 15 +- server/lib/utils.js | 15 +- server/publications/rules.js | 16 +- 15 files changed, 715 insertions(+), 461 deletions(-) diff --git a/client/components/rules/actions/boardActions.js b/client/components/rules/actions/boardActions.js index 0394f601c..3eda039f2 100644 --- a/client/components/rules/actions/boardActions.js +++ b/client/components/rules/actions/boardActions.js @@ -3,63 +3,119 @@ BlazeComponent.extendComponent({ }, - - events() { - return [ - {'click .js-add-spec-move-action'(event) { - const ruleName = this.data().ruleName.get(); - const trigger = this.data().triggerVar.get(); - 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,"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,"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,"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,"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,"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,"desc":desc}); - Rules.insert({title: ruleName, triggerId: triggerId, actionId: actionId,"boardId":boardId}); - } -}, -}]; -}, + return [{ + 'click .js-add-spec-move-action' (event) { + const ruleName = this.data().ruleName.get(); + const trigger = this.data().triggerVar.get(); + 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, + "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, + "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, + "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, + "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, + "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, + "desc": desc + }); + Rules.insert({ + title: ruleName, + triggerId: triggerId, + actionId: actionId, + "boardId": boardId + }); + } + }, + }]; + }, }).register('boardActions'); \ No newline at end of file diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js index 0bf7428a6..a6e74fe9e 100644 --- a/client/components/rules/actions/cardActions.js +++ b/client/components/rules/actions/cardActions.js @@ -3,10 +3,10 @@ BlazeComponent.extendComponent({ this.subscribe('allRules'); }, - labels(){ + labels() { const labels = Boards.findOne(Session.get('currentBoard')).labels; - for(let i = 0;i 0){ + } else if (element.find("select").length > 0) { finalString += element.find("select option:selected").text().toLowerCase(); - }else if(element.find("input").length > 0){ + } else if (element.find("input").length > 0) { finalString += element.find("input").val(); } // Add space - if(i != length - 1){ + if (i != length - 1) { finalString += " "; } } @@ -171,4 +171,4 @@ Utils = { // resized. This is used to reactively re-calculate the popup position in case // of a window resize. This is the equivalent of a "Signal" in some other // programming environments (eg, elm). -$(window).on('resize', () => Utils.windowResizeDep.changed()); +$(window).on('resize', () => Utils.windowResizeDep.changed()); \ No newline at end of file diff --git a/models/actions.js b/models/actions.js index 8062b545f..82ab0d195 100644 --- a/models/actions.js +++ b/models/actions.js @@ -1,6 +1,5 @@ Actions = new Mongo.Collection('actions'); - Actions.allow({ insert(userId, doc) { return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId)); @@ -13,20 +12,8 @@ Actions.allow({ } }); - Actions.helpers({ description() { return this.desc; } -}); - - - - - - - - - - - +}); \ No newline at end of file diff --git a/server/lib/utils.js b/server/lib/utils.js index bdf914efc..17e63514d 100644 --- a/server/lib/utils.js +++ b/server/lib/utils.js @@ -1,19 +1,16 @@ allowIsBoardAdmin = function(userId, board) { - return board && board.hasAdmin(userId); + return board && board.hasAdmin(userId); }; allowIsBoardMember = function(userId, board) { - return board && board.hasMember(userId); + return board && board.hasMember(userId); }; allowIsBoardMemberNonComment = function(userId, board) { - return board && board.hasMember(userId) && !board.hasCommentOnly(userId); + return board && board.hasMember(userId) && !board.hasCommentOnly(userId); }; allowIsBoardMemberByCard = function(userId, card) { - const board = card.board(); - return board && board.hasMember(userId); -}; - - - + const board = card.board(); + return board && board.hasMember(userId); +}; \ No newline at end of file diff --git a/server/publications/rules.js b/server/publications/rules.js index 7aeb66bf0..29be2e787 100644 --- a/server/publications/rules.js +++ b/server/publications/rules.js @@ -1,18 +1,18 @@ Meteor.publish('rules', (ruleId) => { - check(ruleId, String); - return Rules.find({ _id: ruleId }); + check(ruleId, String); + return Rules.find({ + _id: ruleId + }); }); - Meteor.publish('allRules', () => { - return Rules.find({}); + return Rules.find({}); }); - Meteor.publish('allTriggers', () => { - return Triggers.find({}); + return Triggers.find({}); }); Meteor.publish('allActions', () => { - return Actions.find({}); -}); + return Actions.find({}); +}); \ No newline at end of file