github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-24 14:08:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Prettier & eslint project style update

Browse source
This commit is contained in:
Justin Reynolds 2019-06-28 12:52:09 -05:00
parent a0a482aa8e
commit 3eb4d2c341
116 changed files with 6216 additions and 5240 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.eslintrc.json
View file

@ -12,11 +12,8 @@
"meteor": true
},
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module",
"ecmaFeatures": {
"experimentalObjectRestSpread": true
}
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {
"strict": 0,
@ -26,7 +23,7 @@
"consistent-return": 2,
"dot-notation": 2,
"eqeqeq": 2,
"indent": [2, 2],
"indent": 0,
"no-cond-assign": 2,
"no-constant-condition": 2,
"no-eval": 2,
@ -50,7 +47,6 @@
"quotes": [2, "single"],
"semi-spacing": 2,
"space-unary-ops": 2,
"arrow-parens": 2,
"arrow-spacing": 2,
"no-class-assign": 2,
"no-dupe-class-members": 2,
@ -69,7 +65,8 @@
"singleQuote": true,
"trailingComma": "all"
}
]
],
"meteor/no-session": 0
},
"settings": {
"import/resolver": {

88
client/components/activities/activities.js
View file

@ -22,8 +22,7 @@ BlazeComponent.extendComponent({
const limit = this.page.get() * activitiesPerPage;
const user = Meteor.user();
const hideSystem = user ? user.hasHiddenSystemMessages() : false;
if (searchId === null)
return;
if (searchId === null) return;
this.subscribe('activities', mode, searchId, limit, hideSystem, () => {
this.loadNextPageLocked = false;
@ -66,17 +65,26 @@ BlazeComponent.extendComponent({
cardLink() {
const card = this.currentData().card();
return card && Blaze.toHTML(HTML.A({
return (
card &&
Blaze.toHTML(
HTML.A(
{
href: card.absoluteUrl(),
'class': 'action-card',
}, card.title));
class: 'action-card',
},
card.title,
),
)
);
},
lastLabel() {
const lastLabelId = this.currentData().labelId;
if (!lastLabelId)
return null;
const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId);
if (!lastLabelId) return null;
const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(
lastLabelId,
);
if (lastLabel.name === undefined || lastLabel.name === '') {
return lastLabel.color;
} else {
@ -85,23 +93,30 @@ BlazeComponent.extendComponent({
},
lastCustomField() {
const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
if (!lastCustomField)
return null;
const lastCustomField = CustomFields.findOne(
this.currentData().customFieldId,
);
if (!lastCustomField) return null;
return lastCustomField.name;
},
lastCustomFieldValue() {
const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
if (!lastCustomField)
return null;
const lastCustomField = CustomFields.findOne(
this.currentData().customFieldId,
);
if (!lastCustomField) return null;
const value = this.currentData().value;
if (lastCustomField.settings.dropdownItems && lastCustomField.settings.dropdownItems.length > 0) {
const dropDownValue = _.find(lastCustomField.settings.dropdownItems, (item) => {
if (
lastCustomField.settings.dropdownItems &&
lastCustomField.settings.dropdownItems.length > 0
) {
const dropDownValue = _.find(
lastCustomField.settings.dropdownItems,
item => {
return item._id === value;
});
if (dropDownValue)
return dropDownValue.name;
},
);
if (dropDownValue) return dropDownValue.name;
}
return value;
},
@ -114,9 +129,14 @@ BlazeComponent.extendComponent({
const source = this.currentData().source;
if (source) {
if (source.url) {
return Blaze.toHTML(HTML.A({
return Blaze.toHTML(
HTML.A(
{
href: source.url,
}, source.system));
},
source.system,
),
);
} else {
return source.system;
}
@ -133,21 +153,30 @@ BlazeComponent.extendComponent({
attachmentLink() {
const attachment = this.currentData().attachment();
// trying to display url before file is stored generates js errors
return attachment && attachment.url({ download: true }) && Blaze.toHTML(HTML.A({
return (
attachment &&
attachment.url({ download: true }) &&
Blaze.toHTML(
HTML.A(
{
href: attachment.url({ download: true }),
target: '_blank',
}, attachment.name()));
},
attachment.name(),
),
)
);
},
customField() {
const customField = this.currentData().customField();
if (!customField)
return null;
if (!customField) return null;
return customField.name;
},
events() {
return [{
return [
{
// XXX We should use Popup.afterConfirmation here
'click .js-delete-comment'() {
const commentId = this.currentData().commentId;
@ -155,7 +184,9 @@ BlazeComponent.extendComponent({
},
'submit .js-edit-comment'(evt) {
evt.preventDefault();
const commentText = this.currentComponent().getValue().trim();
const commentText = this.currentComponent()
.getValue()
.trim();
const commentId = Template.parentData().commentId;
if (commentText) {
CardComments.update(commentId, {
@ -165,6 +196,7 @@ BlazeComponent.extendComponent({
});
}
},
}];
},
];
},
}).register('activities');

16
client/components/activities/comments.js
View file

@ -14,7 +14,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-new-comment:not(.focus)'() {
commentFormIsOpen.set(true);
},
@ -46,7 +47,8 @@ BlazeComponent.extendComponent({
this.find('button[type=submit]').click();
}
},
}];
},
];
},
}).register('commentForm');
@ -69,7 +71,8 @@ Tracker.autorun(() => {
});
});
EscapeActions.register('inlinedForm',
EscapeActions.register(
'inlinedForm',
() => {
const draftKey = {
fieldName: 'cardComment',
@ -84,7 +87,10 @@ EscapeActions.register('inlinedForm',
}
resetCommentInput(commentInput);
},
() => { return commentFormIsOpen.get(); }, {
() => {
return commentFormIsOpen.get();
},
{
noClickEscapeOn: '.js-new-comment',
}
},
);

21
client/components/boards/boardArchive.js
View file

@ -4,16 +4,22 @@ BlazeComponent.extendComponent({
},
archivedBoards() {
return Boards.find({ archived: true }, {
return Boards.find(
{ archived: true },
{
sort: ['title'],
});
},
);
},
events() {
return [{
return [
{
'click .js-restore-board'() {
// TODO : Make isSandstorm variable global
const isSandstorm = Meteor.settings && Meteor.settings.public &&
const isSandstorm =
Meteor.settings &&
Meteor.settings.public &&
Meteor.settings.public.sandstorm;
if (isSandstorm && Session.get('currentBoard')) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
@ -25,7 +31,9 @@ BlazeComponent.extendComponent({
},
'click .js-delete-board': Popup.afterConfirm('boardDelete', function() {
Popup.close();
const isSandstorm = Meteor.settings && Meteor.settings.public &&
const isSandstorm =
Meteor.settings &&
Meteor.settings.public &&
Meteor.settings.public.sandstorm;
if (isSandstorm && Session.get('currentBoard')) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
@ -34,6 +42,7 @@ BlazeComponent.extendComponent({
Boards.remove(this._id);
FlowRouter.go('home');
}),
}];
},
];
},
}).register('archivedBoards');

84
client/components/boards/boardBody.js
View file

@ -12,8 +12,7 @@ BlazeComponent.extendComponent({
// unfortunatly, Blaze doesn't have this notion.
this.autorun(() => {
const currentBoardId = Session.get('currentBoard');
if (!currentBoardId)
return;
if (!currentBoardId) return;
const handle = subManager.subscribe('board', currentBoardId, false);
Tracker.nonreactive(() => {
Tracker.autorun(() => {
@ -30,7 +29,6 @@ BlazeComponent.extendComponent({
goHome() {
FlowRouter.go('home');
},
}).register('board');
BlazeComponent.extendComponent({
@ -47,7 +45,7 @@ BlazeComponent.extendComponent({
if (nullSortSwimlanes.count() > 0) {
const swimlanes = currentBoardData.swimlanes();
let count = 0;
swimlanes.forEach((s) => {
swimlanes.forEach(s => {
Swimlanes.update(s._id, {
$set: {
sort: count,
@ -62,7 +60,7 @@ BlazeComponent.extendComponent({
if (nullSortLists.count() > 0) {
const lists = currentBoardData.lists();
let count = 0;
lists.forEach((l) => {
lists.forEach(l => {
Lists.update(l._id, {
$set: {
sort: count,
@ -110,12 +108,15 @@ BlazeComponent.extendComponent({
// resize all swimlanes + headers to be a total of 150 px per row
// this could be achieved by setIsDragging(true) but we want immediate
// result
ui.item.siblings('.js-swimlane').css('height', `${swimlaneWhileSortingHeight - 26}px`);
ui.item
.siblings('.js-swimlane')
.css('height', `${swimlaneWhileSortingHeight - 26}px`);
// set the new scroll height after the resize and insertion of
// the placeholder. We want the element under the cursor to stay
// at the same place on the screen
ui.item.parent().get(0).scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
ui.item.parent().get(0).scrollTop =
ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
},
beforeStop(evt, ui) {
const parentOffset = ui.item.parent().offset();
@ -124,7 +125,8 @@ BlazeComponent.extendComponent({
// compute the new scroll height after the resize and removal of
// the placeholder
const scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
const scrollTop =
ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
// then reset the original view of the swimlane
siblings.removeClass('moving-swimlane');
@ -154,11 +156,14 @@ BlazeComponent.extendComponent({
sort(evt, ui) {
// get the mouse position in the sortable
const parentOffset = ui.item.parent().offset();
const cursorY = evt.pageY - parentOffset.top + ui.item.parent().scrollTop();
const cursorY =
evt.pageY - parentOffset.top + ui.item.parent().scrollTop();
// compute the intended index of the placeholder (we need to skip the
// slots between the headers and the list of cards)
const newplaceholderIndex = Math.floor(cursorY / swimlaneWhileSortingHeight);
const newplaceholderIndex = Math.floor(
cursorY / swimlaneWhileSortingHeight,
);
let destPlaceholderIndex = (newplaceholderIndex + 1) * 2;
// if we are scrolling far away from the bottom of the list
@ -169,9 +174,17 @@ BlazeComponent.extendComponent({
// update the placeholder position in the DOM tree
if (destPlaceholderIndex !== ui.placeholder.index()) {
if (destPlaceholderIndex < boardComponent.origPlaceholderIndex) {
ui.placeholder.insertBefore(ui.placeholder.siblings().slice(destPlaceholderIndex - 2, destPlaceholderIndex - 1));
ui.placeholder.insertBefore(
ui.placeholder
.siblings()
.slice(destPlaceholderIndex - 2, destPlaceholderIndex - 1),
);
} else {
ui.placeholder.insertAfter(ui.placeholder.siblings().slice(destPlaceholderIndex - 1, destPlaceholderIndex));
ui.placeholder.insertAfter(
ui.placeholder
.siblings()
.slice(destPlaceholderIndex - 1, destPlaceholderIndex),
);
}
}
},
@ -181,7 +194,11 @@ BlazeComponent.extendComponent({
enableClickOnTouch('.js-swimlane:not(.placeholder)');
function userIsMember() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
}
// If there is no data in the board (ie, no lists) we autofocus the list
@ -195,32 +212,35 @@ BlazeComponent.extendComponent({
isViewSwimlanes() {
const currentUser = Meteor.user();
if (!currentUser) return false;
return ((currentUser.profile || {}).boardView === 'board-view-swimlanes');
return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
},
isViewLists() {
const currentUser = Meteor.user();
if (!currentUser) return true;
return ((currentUser.profile || {}).boardView === 'board-view-lists');
return (currentUser.profile || {}).boardView === 'board-view-lists';
},
isViewCalendar() {
const currentUser = Meteor.user();
if (!currentUser) return false;
return ((currentUser.profile || {}).boardView === 'board-view-cal');
return (currentUser.profile || {}).boardView === 'board-view-cal';
},
openNewListForm() {
if (this.isViewSwimlanes()) {
this.childComponents('swimlane')[0]
.childComponents('addListAndSwimlaneForm')[0].open();
.childComponents('addListAndSwimlaneForm')[0]
.open();
} else if (this.isViewLists()) {
this.childComponents('listsGroup')[0]
.childComponents('addListForm')[0].open();
.childComponents('addListForm')[0]
.open();
}
},
events() {
return [{
return [
{
// XXX The board-overlay div should probably be moved to the parent
// component.
'mouseenter .board-overlay'() {
@ -228,12 +248,13 @@ BlazeComponent.extendComponent({
this.showOverlay.set(false);
}
},
'mouseup'() {
mouseup() {
if (this._isDragging) {
this._isDragging = false;
}
},
}];
},
];
},
// XXX Flow components allow us to avoid creating these two setter methods by
@ -245,18 +266,19 @@ BlazeComponent.extendComponent({
scrollLeft(position = 0) {
const swimlanes = this.$('.js-swimlanes');
swimlanes && swimlanes.animate({
swimlanes &&
swimlanes.animate({
scrollLeft: position,
});
},
scrollTop(position = 0) {
const swimlanes = this.$('.js-swimlanes');
swimlanes && swimlanes.animate({
swimlanes &&
swimlanes.animate({
scrollTop: position,
});
},
}).register('boardBody');
BlazeComponent.extendComponent({
@ -273,7 +295,8 @@ BlazeComponent.extendComponent({
timezone: 'local',
header: {
left: 'title today prev,next',
center: 'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear',
center:
'agendaDay,listDay,timelineDay agendaWeek,listWeek,timelineWeek month,timelineMonth timelineYear',
right: '',
},
// height: 'parent', nope, doesn't work as the parent might be small
@ -291,13 +314,18 @@ BlazeComponent.extendComponent({
events(start, end, timezone, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
const events = [];
currentBoard.cardsInInterval(start.toDate(), end.toDate()).forEach(function(card){
currentBoard
.cardsInInterval(start.toDate(), end.toDate())
.forEach(function(card) {
events.push({
id: card._id,
title: card.title,
start: card.startAt,
end: card.endAt,
allDay: Math.abs(card.endAt.getTime() - card.startAt.getTime()) / 1000 === 24*3600,
allDay:
Math.abs(card.endAt.getTime() - card.startAt.getTime()) /
1000 ===
24 * 3600,
url: FlowRouter.url('card', {
boardId: currentBoard._id,
slug: currentBoard.slug,
@ -339,6 +367,6 @@ BlazeComponent.extendComponent({
isViewCalendar() {
const currentUser = Meteor.user();
if (!currentUser) return false;
return ((currentUser.profile || {}).boardView === 'board-view-cal');
return (currentUser.profile || {}).boardView === 'board-view-cal';
},
}).register('calendarView');

90
client/components/boards/boardHeader.js
View file

@ -45,15 +45,21 @@ Template.boardMenuPopup.helpers({
});
Template.boardChangeTitlePopup.events({
submit(evt, tpl) {
const newTitle = tpl.$('.js-board-name').val().trim();
const newDesc = tpl.$('.js-board-desc').val().trim();
submit(event, templateInstance) {
const newTitle = templateInstance
.$('.js-board-name')
.val()
.trim();
const newDesc = templateInstance
.$('.js-board-desc')
.val()
.trim();
if (newTitle) {
this.rename(newTitle);
this.setDescription(newDesc);
Popup.close();
}
evt.preventDefault();
event.preventDefault();
},
});
@ -76,7 +82,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-edit-board-title': Popup.open('boardChangeTitle'),
'click .js-star-board'() {
Meteor.user().toggleBoardStar(Session.get('currentBoard'));
@ -89,11 +96,17 @@ BlazeComponent.extendComponent({
},
'click .js-toggle-board-view'() {
const currentUser = Meteor.user();
if ((currentUser.profile || {}).boardView === 'board-view-swimlanes') {
if (
(currentUser.profile || {}).boardView === 'board-view-swimlanes'
) {
currentUser.setBoardView('board-view-cal');
} else if ((currentUser.profile || {}).boardView === 'board-view-lists') {
} else if (
(currentUser.profile || {}).boardView === 'board-view-lists'
) {
currentUser.setBoardView('board-view-swimlanes');
} else if ((currentUser.profile || {}).boardView === 'board-view-cal') {
} else if (
(currentUser.profile || {}).boardView === 'board-view-cal'
) {
currentUser.setBoardView('board-view-lists');
} else {
currentUser.setBoardView('board-view-swimlanes');
@ -105,8 +118,8 @@ BlazeComponent.extendComponent({
'click .js-open-filter-view'() {
Sidebar.setView('filter');
},
'click .js-filter-reset'(evt) {
evt.stopPropagation();
'click .js-filter-reset'(event) {
event.stopPropagation();
Sidebar.setView();
Filter.reset();
},
@ -123,20 +136,25 @@ BlazeComponent.extendComponent({
MultiSelection.add(currentCard);
}
},
'click .js-multiselection-reset'(evt) {
evt.stopPropagation();
'click .js-multiselection-reset'(event) {
event.stopPropagation();
MultiSelection.disable();
},
'click .js-log-in'() {
FlowRouter.go('atSignIn');
},
}];
},
];
},
}).register('boardHeaderBar');
Template.boardHeaderBar.helpers({
canModifyBoard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
});
@ -164,15 +182,17 @@ const CreateBoard = BlazeComponent.extendComponent({
this.visibilityMenuIsOpen.set(!this.visibilityMenuIsOpen.get());
},
onSubmit(evt) {
evt.preventDefault();
onSubmit(event) {
event.preventDefault();
const title = this.find('.js-new-board-title').value;
const visibility = this.visibility.get();
this.boardId.set(Boards.insert({
this.boardId.set(
Boards.insert({
title,
permission: visibility,
}));
}),
);
Swimlanes.insert({
title: 'Default',
@ -183,7 +203,8 @@ const CreateBoard = BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-select-visibility'() {
this.setVisibility(this.currentData());
},
@ -192,17 +213,18 @@ const CreateBoard = BlazeComponent.extendComponent({
submit: this.onSubmit,
'click .js-import-board': Popup.open('chooseBoardSource'),
'click .js-board-template': Popup.open('searchElement'),
}];
},
];
},
}).register('createBoardPopup');
(class HeaderBarCreateBoard extends CreateBoard {
onSubmit(evt) {
super.onSubmit(evt);
onSubmit(event) {
super.onSubmit(event);
// Immediately star boards crated with the headerbar popup.
Meteor.user().toggleBoardStar(this.boardId.get());
}
}).register('headerBarCreateBoardPopup');
}.register('headerBarCreateBoardPopup'));
BlazeComponent.extendComponent({
visibilityCheck() {
@ -218,9 +240,11 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-select-visibility': this.selectBoardVisibility,
}];
},
];
},
}).register('boardChangeVisibilityPopup');
@ -235,13 +259,21 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-select-watch'() {
const level = this.currentData();
Meteor.call('watch', 'board', Session.get('currentBoard'), level, (err, ret) => {
Meteor.call(
'watch',
'board',
Session.get('currentBoard'),
level,
(err, ret) => {
if (!err && ret) Popup.close();
});
},
}];
);
},
},
];
},
}).register('boardChangeWatchPopup');

18
client/components/boards/boardsList.js
View file

@ -21,11 +21,14 @@ BlazeComponent.extendComponent({
},
boards() {
return Boards.find({
return Boards.find(
{
archived: false,
'members.userId': Meteor.userId(),
type: 'board',
}, { sort: ['title'] });
},
{ sort: ['title'] },
);
},
isStarred() {
const user = Meteor.user();
@ -48,7 +51,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-add-board': Popup.open('createBoard'),
'click .js-star-board'(evt) {
const boardId = this.currentData()._id;
@ -56,7 +60,8 @@ BlazeComponent.extendComponent({
evt.preventDefault();
},
'click .js-clone-board'(evt) {
Meteor.call('cloneBoard',
Meteor.call(
'cloneBoard',
this.currentData()._id,
Session.get('fromBoard'),
(err, res) => {
@ -66,7 +71,7 @@ BlazeComponent.extendComponent({
Session.set('fromBoard', null);
Utils.goBoardId(res);
}
}
},
);
evt.preventDefault();
},
@ -88,6 +93,7 @@ BlazeComponent.extendComponent({
}
});
},
}];
},
];
},
}).register('boardList');

33
client/components/cards/attachments.js
View file

@ -1,10 +1,11 @@
Template.attachmentsGalery.events({
'click .js-add-attachment': Popup.open('cardAttachments'),
'click .js-confirm-delete': Popup.afterConfirm('attachmentDelete',
'click .js-confirm-delete': Popup.afterConfirm(
'attachmentDelete',
function() {
Attachments.remove(this._id);
Popup.close();
}
},
),
// If we let this event bubble, FlowRouter will handle it and empty the page
// content, see #101.
@ -17,8 +18,8 @@ Template.attachmentsGalery.events({
'click .js-remove-cover'() {
Cards.findOne(this.cardId).unsetCover();
},
'click .js-preview-image'(evt) {
Popup.open('previewAttachedImage').call(this, evt);
'click .js-preview-image'(event) {
Popup.open('previewAttachedImage').call(this, event);
// when multiple thumbnails, if click one then another very fast,
// we might get a wrong width from previous img.
// when popup reused, onRendered() won't be called, so we cannot get there.
@ -31,18 +32,16 @@ Template.attachmentsGalery.events({
// if the image is too large, we resize & center the popup.
if (w > 300) {
$('div.pop-over').css({
width: (w + 20),
width: w + 20,
position: 'absolute',
left: (window.innerWidth - w) / 2,
top: (window.innerHeight - h) / 2,
});
}
};
const url = $(evt.currentTarget).attr('src');
if (img.src === url && img.complete)
rePosPopup();
else
img.onload = rePosPopup;
const url = $(event.currentTarget).attr('src');
if (img.src === url && img.complete) rePosPopup();
else img.onload = rePosPopup;
},
});
@ -53,9 +52,9 @@ Template.previewAttachedImagePopup.events({
});
Template.cardAttachmentsPopup.events({
'change .js-attach-file'(evt) {
'change .js-attach-file'(event) {
const card = this;
FS.Utility.eachFile(evt, (f) => {
FS.Utility.eachFile(event, f => {
const file = new FS.File(f);
if (card.isLinkedCard()) {
file.boardId = Cards.findOne(card.linkedId).boardId;
@ -77,9 +76,9 @@ Template.cardAttachmentsPopup.events({
Popup.close();
});
},
'click .js-computer-upload'(evt, tpl) {
tpl.find('.js-attach-file').click();
evt.preventDefault();
'click .js-computer-upload'(event, templateInstance) {
templateInstance.find('.js-attach-file').click();
event.preventDefault();
},
'click .js-upload-clipboard-image': Popup.open('previewClipboardImage'),
});
@ -88,7 +87,7 @@ let pastedResults = null;
Template.previewClipboardImagePopup.onRendered(() => {
// we can paste image from clipboard
$(document.body).pasteImageReader((results) => {
$(document.body).pasteImageReader(results => {
if (results.dataURL.startsWith('data:image/')) {
$('img.preview-clipboard-image').attr('src', results.dataURL);
pastedResults = results;
@ -96,7 +95,7 @@ Template.previewClipboardImagePopup.onRendered(() => {
});
// we can also drag & drop image file to it
$(document.body).dropImageReader((results) => {
$(document.body).dropImageReader(results => {
if (results.dataURL.startsWith('data:image/')) {
$('img.preview-clipboard-image').attr('src', results.dataURL);
pastedResults = results;

81
client/components/cards/cardCustomFields.js
View file

@ -7,22 +7,21 @@ Template.cardCustomFieldsPopup.helpers({
});
Template.cardCustomFieldsPopup.events({
'click .js-select-field'(evt) {
'click .js-select-field'(event) {
const card = Cards.findOne(Session.get('currentCard'));
const customFieldId = this._id;
card.toggleCustomField(customFieldId);
evt.preventDefault();
event.preventDefault();
},
'click .js-settings'(evt) {
'click .js-settings'(event) {
EscapeActions.executeUpTo('detailsPane');
Sidebar.setView('customFields');
evt.preventDefault();
event.preventDefault();
},
});
// cardCustomField
const CardCustomField = BlazeComponent.extendComponent({
getTemplate() {
return `cardCustomField-${this.data().definition.type}`;
},
@ -34,52 +33,55 @@ const CardCustomField = BlazeComponent.extendComponent({
},
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
});
CardCustomField.register('cardCustomField');
// cardCustomField-text
(class extends CardCustomField {
onCreated() {
super.onCreated();
}
events() {
return [{
'submit .js-card-customfield-text'(evt) {
evt.preventDefault();
return [
{
'submit .js-card-customfield-text'(event) {
event.preventDefault();
const value = this.currentComponent().getValue();
this.card.setCustomField(this.customFieldId, value);
},
}];
},
];
}
}).register('cardCustomField-text');
}.register('cardCustomField-text'));
// cardCustomField-number
(class extends CardCustomField {
onCreated() {
super.onCreated();
}
events() {
return [{
'submit .js-card-customfield-number'(evt) {
evt.preventDefault();
return [
{
'submit .js-card-customfield-number'(event) {
event.preventDefault();
const value = parseInt(this.find('input').value, 10);
this.card.setCustomField(this.customFieldId, value);
},
}];
},
];
}
}).register('cardCustomField-number');
}.register('cardCustomField-number'));
// cardCustomField-date
(class extends CardCustomField {
onCreated() {
super.onCreated();
const self = this;
@ -108,8 +110,10 @@ CardCustomField.register('cardCustomField');
}
classes() {
if (this.date.get().isBefore(this.now.get(), 'minute') &&
this.now.get().isBefore(this.data().value)) {
if (
this.date.get().isBefore(this.now.get(), 'minute') &&
this.now.get().isBefore(this.data().value)
) {
return 'current';
}
return '';
@ -120,12 +124,13 @@ CardCustomField.register('cardCustomField');
}
events() {
return [{
return [
{
'click .js-edit-date': Popup.open('cardCustomField-date'),
}];
},
];
}
}).register('cardCustomField-date');
}.register('cardCustomField-date'));
// cardCustomField-datePopup
(class extends DatePicker {
@ -144,11 +149,10 @@ CardCustomField.register('cardCustomField');
_deleteDate() {
this.card.setCustomField(this.customFieldId, '');
}
}).register('cardCustomField-datePopup');
}.register('cardCustomField-datePopup'));
// cardCustomField-dropdown
(class extends CardCustomField {
onCreated() {
super.onCreated();
this._items = this.data().definition.settings.dropdownItems;
@ -160,20 +164,23 @@ CardCustomField.register('cardCustomField');
}
selectedItem() {
const selected = this._items.find((item) => {
const selected = this._items.find(item => {
return item._id === this.data().value;
});
return (selected) ? selected.name : TAPi18n.__('custom-field-dropdown-unknown');
return selected
? selected.name
: TAPi18n.__('custom-field-dropdown-unknown');
}
events() {
return [{
'submit .js-card-customfield-dropdown'(evt) {
evt.preventDefault();
return [
{
'submit .js-card-customfield-dropdown'(event) {
event.preventDefault();
const value = this.find('select').value;
this.card.setCustomField(this.customFieldId, value);
},
}];
},
];
}
}).register('cardCustomField-dropdown');
}.register('cardCustomField-dropdown'));

110
client/components/cards/cardDate.js
View file

@ -11,15 +11,20 @@ BlazeComponent.extendComponent({
},
onRendered() {
const $picker = this.$('.js-datepicker').datepicker({
const $picker = this.$('.js-datepicker')
.datepicker({
todayHighlight: true,
todayBtn: 'linked',
language: TAPi18n.getLanguage(),
}).on('changeDate', function(evt) {
})
.on(
'changeDate',
function(evt) {
this.find('#date').value = moment(evt.date).format('L');
this.error.set('');
this.find('#time').focus();
}.bind(this));
}.bind(this),
);
if (this.date.get().isValid()) {
$picker.datepicker('update', this.date.get().toDate());
@ -27,13 +32,11 @@ BlazeComponent.extendComponent({
},
showDate() {
if (this.date.get().isValid())
return this.date.get().format('L');
if (this.date.get().isValid()) return this.date.get().format('L');
return '';
},
showTime() {
if (this.date.get().isValid())
return this.date.get().format('LT');
if (this.date.get().isValid()) return this.date.get().format('LT');
return '';
},
dateFormat() {
@ -44,7 +47,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'keyup .js-date-field'() {
// parse for localized date format in strict mode
const dateMoment = moment(this.find('#date').value, 'L', true);
@ -64,15 +68,16 @@ BlazeComponent.extendComponent({
evt.preventDefault();
// if no time was given, init with 12:00
const time = evt.target.time.value || moment(new Date().setHours(12, 0, 0)).format('LT');
const time =
evt.target.time.value ||
moment(new Date().setHours(12, 0, 0)).format('LT');
const dateString = `${evt.target.date.value} ${time}`;
const newDate = moment(dateString, 'L LT', true);
if (newDate.isValid()) {
this._storeDate(newDate.toDate());
Popup.close();
}
else {
} else {
this.error.set('invalid-date');
evt.target.date.focus();
}
@ -82,13 +87,18 @@ BlazeComponent.extendComponent({
this._deleteDate();
Popup.close();
},
}];
},
];
},
});
Template.dateBadge.helpers({
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
});
@ -96,7 +106,8 @@ Template.dateBadge.helpers({
(class extends DatePicker {
onCreated() {
super.onCreated();
this.data().getReceived() && this.date.set(moment(this.data().getReceived()));
this.data().getReceived() &&
this.date.set(moment(this.data().getReceived()));
}
_storeDate(date) {
@ -106,8 +117,7 @@ Template.dateBadge.helpers({
_deleteDate() {
this.card.setReceived(null);
}
}).register('editCardReceivedDatePopup');
}.register('editCardReceivedDatePopup'));
// editCardStartDatePopup
(class extends DatePicker {
@ -119,7 +129,10 @@ Template.dateBadge.helpers({
onRendered() {
super.onRendered();
if (moment.isDate(this.card.getReceived())) {
this.$('.js-datepicker').datepicker('setStartDate', this.card.getReceived());
this.$('.js-datepicker').datepicker(
'setStartDate',
this.card.getReceived(),
);
}
}
@ -130,7 +143,7 @@ Template.dateBadge.helpers({
_deleteDate() {
this.card.setStart(null);
}
}).register('editCardStartDatePopup');
}.register('editCardStartDatePopup'));
// editCardDueDatePopup
(class extends DatePicker {
@ -153,7 +166,7 @@ Template.dateBadge.helpers({
_deleteDate() {
this.card.setDue(null);
}
}).register('editCardDueDatePopup');
}.register('editCardDueDatePopup'));
// editCardEndDatePopup
(class extends DatePicker {
@ -176,8 +189,7 @@ Template.dateBadge.helpers({
_deleteDate() {
this.card.setEnd(null);
}
}).register('editCardEndDatePopup');
}.register('editCardEndDatePopup'));
// Display received, start, due & end dates
const CardDate = BlazeComponent.extendComponent({
@ -224,17 +236,20 @@ class CardReceivedDate extends CardDate {
const startAt = this.data().getStart();
const theDate = this.date.get();
// if dueAt, endAt and startAt exist & are > receivedAt, receivedAt doesn't need to be flagged
if (((startAt) && (theDate.isAfter(dueAt))) ||
((endAt) && (theDate.isAfter(endAt))) ||
((dueAt) && (theDate.isAfter(dueAt))))
if (
(startAt && theDate.isAfter(dueAt)) ||
(endAt && theDate.isAfter(endAt)) ||
(dueAt && theDate.isAfter(dueAt))
)
classes += 'long-overdue';
else
classes += 'current';
else classes += 'current';
return classes;
}
showTitle() {
return `${TAPi18n.__('card-received-on')} ${this.date.get().format('LLLL')}`;
return `${TAPi18n.__('card-received-on')} ${this.date
.get()
.format('LLLL')}`;
}
events() {
@ -261,13 +276,10 @@ class CardStartDate extends CardDate {
const theDate = this.date.get();
const now = this.now.get();
// if dueAt or endAt exist & are > startAt, startAt doesn't need to be flagged
if (((endAt) && (theDate.isAfter(endAt))) ||
((dueAt) && (theDate.isAfter(dueAt))))
if ((endAt && theDate.isAfter(endAt)) || (dueAt && theDate.isAfter(dueAt)))
classes += 'long-overdue';
else if (theDate.isBefore(now, 'minute'))
classes += 'almost-due';
else
classes += 'current';
else if (theDate.isBefore(now, 'minute')) classes += 'almost-due';
else classes += 'current';
return classes;
}
@ -298,17 +310,12 @@ class CardDueDate extends CardDate {
const theDate = this.date.get();
const now = this.now.get();
// if the due date is after the end date, green - done early
if ((endAt) && (theDate.isAfter(endAt)))
classes += 'current';
if (endAt && theDate.isAfter(endAt)) classes += 'current';
// if there is an end date, don't need to flag the due date
else if (endAt)
classes += '';
else if (now.diff(theDate, 'days') >= 2)
classes += 'long-overdue';
else if (now.diff(theDate, 'minute') >= 0)
classes += 'due';
else if (now.diff(theDate, 'days') >= -1)
classes += 'almost-due';
else if (endAt) classes += '';
else if (now.diff(theDate, 'days') >= 2) classes += 'long-overdue';
else if (now.diff(theDate, 'minute') >= 0) classes += 'due';
else if (now.diff(theDate, 'days') >= -1) classes += 'almost-due';
return classes;
}
@ -337,12 +344,9 @@ class CardEndDate extends CardDate {
let classes = 'end-date' + ' ';
const dueAt = this.data().getDue();
const theDate = this.date.get();
if (theDate.diff(dueAt, 'days') >= 2)
classes += 'long-overdue';
else if (theDate.diff(dueAt, 'days') >= 0)
classes += 'due';
else if (theDate.diff(dueAt, 'days') >= -2)
classes += 'almost-due';
if (theDate.diff(dueAt, 'days') >= 2) classes += 'long-overdue';
else if (theDate.diff(dueAt, 'days') >= 0) classes += 'due';
else if (theDate.diff(dueAt, 'days') >= -2) classes += 'almost-due';
return classes;
}
@ -362,22 +366,22 @@ CardEndDate.register('cardEndDate');
showDate() {
return this.date.get().format('l');
}
}).register('minicardReceivedDate');
}.register('minicardReceivedDate'));
(class extends CardStartDate {
showDate() {
return this.date.get().format('l');
}
}).register('minicardStartDate');
}.register('minicardStartDate'));
(class extends CardDueDate {
showDate() {
return this.date.get().format('l');
}
}).register('minicardDueDate');
}.register('minicardDueDate'));
(class extends CardEndDate {
showDate() {
return this.date.get().format('l');
}
}).register('minicardEndDate');
}.register('minicardEndDate'));

187
client/components/cards/cardDetails.js
View file

@ -48,7 +48,11 @@ BlazeComponent.extendComponent({
},
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
scrollParentContainer() {
@ -86,12 +90,11 @@ BlazeComponent.extendComponent({
if (topOffset !== false) {
bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
}
},
presentParentTask() {
let result = this.currentBoard.presentParentTask;
if ((result === null) || (result === undefined)) {
if (result === null || result === undefined) {
result = 'no-parent';
}
return result;
@ -116,7 +119,13 @@ BlazeComponent.extendComponent({
onRendered() {
if (!Utils.isMiniScreen()) {
Meteor.setTimeout(() => {
$('.card-details').mCustomScrollbar({theme:'minimal-dark', setWidth: false, setLeft: 0, scrollbarPosition: 'outside', mouseWheel: true });
$('.card-details').mCustomScrollbar({
theme: 'minimal-dark',
setWidth: false,
setLeft: 0,
scrollbarPosition: 'outside',
mouseWheel: true,
});
this.scrollParentContainer();
}, 500);
}
@ -228,34 +237,41 @@ BlazeComponent.extendComponent({
},
};
return [{
return [
{
...events,
'click .js-close-card-details'() {
Utils.goBoardId(this.data().boardId);
},
'click .js-open-card-details-menu': Popup.open('cardDetailsActions'),
'submit .js-card-description' (evt) {
evt.preventDefault();
'submit .js-card-description'(event) {
event.preventDefault();
const description = this.currentComponent().getValue();
this.data().setDescription(description);
},
'submit .js-card-details-title' (evt) {
evt.preventDefault();
const title = this.currentComponent().getValue().trim();
'submit .js-card-details-title'(event) {
event.preventDefault();
const title = this.currentComponent()
.getValue()
.trim();
if (title) {
this.data().setTitle(title);
}
},
'submit .js-card-details-assigner'(evt) {
evt.preventDefault();
const assigner = this.currentComponent().getValue().trim();
'submit .js-card-details-assigner'(event) {
event.preventDefault();
const assigner = this.currentComponent()
.getValue()
.trim();
if (assigner) {
this.data().setAssignedBy(assigner);
}
},
'submit .js-card-details-requester'(evt) {
evt.preventDefault();
const requester = this.currentComponent().getValue().trim();
'submit .js-card-details-requester'(event) {
event.preventDefault();
const requester = this.currentComponent()
.getValue()
.trim();
if (requester) {
this.data().setRequestedBy(requester);
}
@ -277,7 +293,8 @@ BlazeComponent.extendComponent({
'click #toggleButton'() {
Meteor.call('toggleSystemMessages');
},
}];
},
];
},
}).register('cardDetails');
@ -297,7 +314,9 @@ BlazeComponent.extendComponent({
close(isReset = false) {
if (this.isOpen.get() && !isReset) {
const draft = this.getValue().trim();
if (draft !== Cards.findOne(Session.get('currentCard')).getDescription()) {
if (
draft !== Cards.findOne(Session.get('currentCard')).getDescription()
) {
UnsavedEdits.set(this._getUnsavedEditKey(), this.getValue());
}
}
@ -311,12 +330,14 @@ BlazeComponent.extendComponent({
events() {
const parentEvents = InlinedForm.prototype.events()[0];
return [{
return [
{
...parentEvents,
'click .js-close-inlined-form': this.reset,
}];
},
];
}
}).register('inlinedCardDescription');
}.register('inlinedCardDescription'));
Template.cardDetailsActionsPopup.helpers({
isWatching() {
@ -324,7 +345,11 @@ Template.cardDetailsActionsPopup.helpers({
},
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
});
@ -342,18 +367,26 @@ Template.cardDetailsActionsPopup.events({
'click .js-copy-card': Popup.open('copyCard'),
'click .js-copy-checklist-cards': Popup.open('copyChecklistToManyCards'),
'click .js-set-card-color': Popup.open('setCardColor'),
'click .js-move-card-to-top' (evt) {
evt.preventDefault();
const minOrder = _.min(this.list().cards(this.swimlaneId).map((c) => c.sort));
'click .js-move-card-to-top'(event) {
event.preventDefault();
const minOrder = _.min(
this.list()
.cards(this.swimlaneId)
.map(c => c.sort),
);
this.move(this.boardId, this.swimlaneId, this.listId, minOrder - 1);
},
'click .js-move-card-to-bottom' (evt) {
evt.preventDefault();
const maxOrder = _.max(this.list().cards(this.swimlaneId).map((c) => c.sort));
'click .js-move-card-to-bottom'(event) {
event.preventDefault();
const maxOrder = _.max(
this.list()
.cards(this.swimlaneId)
.map(c => c.sort),
);
this.move(this.boardId, this.swimlaneId, this.listId, maxOrder + 1);
},
'click .js-archive' (evt) {
evt.preventDefault();
'click .js-archive'(event) {
event.preventDefault();
this.archive();
Popup.close();
},
@ -372,10 +405,10 @@ Template.editCardTitleForm.onRendered(function () {
});
Template.editCardTitleForm.events({
'keydown .js-edit-card-title' (evt) {
'keydown .js-edit-card-title'(event) {
// If enter key was pressed, submit the data
// Unless the shift key is also being pressed
if (evt.keyCode === 13 && !evt.shiftKey) {
if (event.keyCode === 13 && !event.shiftKey) {
$('.js-submit-edit-card-title-form').click();
}
},
@ -386,9 +419,9 @@ Template.editCardRequesterForm.onRendered(function() {
});
Template.editCardRequesterForm.events({
'keydown .js-edit-card-requester'(evt) {
'keydown .js-edit-card-requester'(event) {
// If enter key was pressed, submit the data
if (evt.keyCode === 13) {
if (event.keyCode === 13) {
$('.js-submit-edit-card-requester-form').click();
}
},
@ -399,9 +432,9 @@ Template.editCardAssignerForm.onRendered(function() {
});
Template.editCardAssignerForm.events({
'keydown .js-edit-card-assigner'(evt) {
'keydown .js-edit-card-assigner'(event) {
// If enter key was pressed, submit the data
if (evt.keyCode === 13) {
if (event.keyCode === 13) {
$('.js-submit-edit-card-assigner-form').click();
}
},
@ -429,13 +462,16 @@ BlazeComponent.extendComponent({
},
boards() {
const boards = Boards.find({
const boards = Boards.find(
{
archived: false,
'members.userId': Meteor.userId(),
_id: { $ne: Meteor.user().getTemplatesBoardId() },
}, {
},
{
sort: ['title'],
});
},
);
return boards;
},
@ -450,12 +486,14 @@ BlazeComponent.extendComponent({
},
events() {
return [{
'change .js-select-boards'(evt) {
this.selectedBoardId.set($(evt.currentTarget).val());
return [
{
'change .js-select-boards'(event) {
this.selectedBoardId.set($(event.currentTarget).val());
subManager.subscribe('board', this.selectedBoardId.get(), false);
},
}];
},
];
},
}).register('boardsAndLists');
@ -471,7 +509,9 @@ Template.copyCardPopup.events({
const textarea = $('#copy-card-title');
const title = textarea.val().trim();
// insert new card to the bottom of new list
card.sort = Lists.findOne(card.listId).cards().count();
card.sort = Lists.findOne(card.listId)
.cards()
.count();
if (title) {
card.title = title;
@ -502,7 +542,9 @@ Template.copyChecklistToManyCardsPopup.events({
const textarea = $('#copy-card-title');
const titleEntry = textarea.val().trim();
// insert new card to the bottom of new list
card.sort = Lists.findOne(card.listId).cards().count();
card.sort = Lists.findOne(card.listId)
.cards()
.count();
if (titleEntry) {
const titleList = JSON.parse(titleEntry);
@ -519,7 +561,7 @@ Template.copyChecklistToManyCardsPopup.events({
Filter.addException(_id);
// copy checklists
Checklists.find({cardId: oldId}).forEach((ch) => {
Checklists.find({ cardId: oldId }).forEach(ch => {
ch.copy(_id);
});
@ -534,7 +576,7 @@ Template.copyChecklistToManyCardsPopup.events({
});
// copy card comments
CardComments.find({cardId: oldId}).forEach((cmt) => {
CardComments.find({ cardId: oldId }).forEach(cmt => {
cmt.copy(_id);
});
}
@ -550,7 +592,7 @@ BlazeComponent.extendComponent({
},
colors() {
return cardColors.map((color) => ({ color, name: '' }));
return cardColors.map(color => ({ color, name: '' }));
},
isSelected(color) {
@ -561,7 +603,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-palette-color'() {
this.currentColor.set(this.currentData().color);
},
@ -573,7 +616,8 @@ BlazeComponent.extendComponent({
this.currentCard.setColor(null);
Popup.close();
},
}];
},
];
},
}).register('setCardColorPopup');
@ -592,15 +636,18 @@ BlazeComponent.extendComponent({
},
boards() {
const boards = Boards.find({
const boards = Boards.find(
{
archived: false,
'members.userId': Meteor.userId(),
_id: {
$ne: Meteor.user().getTemplatesBoardId(),
},
}, {
},
{
sort: ['title'],
});
},
);
return boards;
},
@ -642,7 +689,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-copy-card-link-to-clipboard'() {
// Clipboard code from:
// https://stackoverflow.com/questions/6300213/copy-selected-text-to-the-clipboard-without-using-flash-must-be-cross-browser
@ -655,12 +703,15 @@ BlazeComponent.extendComponent({
document.getElementById('cardURL').selectionEnd = 999;
document.execCommand('copy');
if (window.getSelection) {
if (window.getSelection().empty) { // Chrome
if (window.getSelection().empty) {
// Chrome
window.getSelection().empty();
} else if (window.getSelection().removeAllRanges) { // Firefox
} else if (window.getSelection().removeAllRanges) {
// Firefox
window.getSelection().removeAllRanges();
}
} else if (document.selection) { // IE?
} else if (document.selection) {
// IE?
document.selection.empty();
}
}
@ -670,35 +721,37 @@ BlazeComponent.extendComponent({
Cards.remove(this._id);
Utils.goBoardId(this.boardId);
}),
'change .js-field-parent-board'(evt) {
const selection = $(evt.currentTarget).val();
'change .js-field-parent-board'(event) {
const selection = $(event.currentTarget).val();
const list = $('.js-field-parent-card');
if (selection === 'none') {
this.parentBoard.set(null);
} else {
subManager.subscribe('board', $(evt.currentTarget).val(), false);
subManager.subscribe('board', $(event.currentTarget).val(), false);
this.parentBoard.set(selection);
list.prop('disabled', false);
}
this.setParentCardId(null);
},
'change .js-field-parent-card'(evt) {
const selection = $(evt.currentTarget).val();
'change .js-field-parent-card'(event) {
const selection = $(event.currentTarget).val();
this.setParentCardId(selection);
},
}];
},
];
},
}).register('cardMorePopup');
// Close the card details pane by pressing escape
EscapeActions.register('detailsPane',
EscapeActions.register(
'detailsPane',
() => {
Utils.goBoardId(Session.get('currentBoard'));
},
() => {
return !Session.equals('currentCard', null);
}, {
},
{
noClickEscapeOn: '.js-card-details,.board-sidebar,#header',
}
},
);

26
client/components/cards/cardTime.js
View file

@ -20,7 +20,8 @@ BlazeComponent.extendComponent({
this.card.setSpentTime(null);
},
events() {
return [{
return [
{
//TODO : need checking this portion
'submit .edit-time'(evt) {
evt.preventDefault();
@ -42,7 +43,8 @@ BlazeComponent.extendComponent({
Popup.close();
},
'click a.js-toggle-overtime': this.toggleOvertime,
}];
},
];
},
}).register('editCardSpentTimePopup');
@ -56,23 +58,33 @@ BlazeComponent.extendComponent({
},
showTitle() {
if (this.data().getIsOvertime()) {
return `${TAPi18n.__('overtime')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
return `${TAPi18n.__(
'overtime',
)} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
} else {
return `${TAPi18n.__('card-spent')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
return `${TAPi18n.__(
'card-spent',
)} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
}
},
showTime() {
return this.data().getSpentTime();
},
events() {
return [{
return [
{
'click .js-edit-time': Popup.open('editCardSpentTime'),
}];
},
];
},
}).register('cardSpentTime');
Template.timeBadge.helpers({
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
});

48
client/components/cards/checklists.js
View file

@ -64,20 +64,22 @@ BlazeComponent.extendComponent({
},
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
}).register('checklistDetail');
BlazeComponent.extendComponent({
addChecklist(event) {
event.preventDefault();
const textarea = this.find('textarea.js-add-checklist-item');
const title = textarea.value.trim();
let cardId = this.currentData().cardId;
const card = Cards.findOne(cardId);
if (card.isLinked())
cardId = card.linkedId;
if (card.isLinked()) cardId = card.linkedId;
if (title) {
Checklists.insert({
@ -86,7 +88,9 @@ BlazeComponent.extendComponent({
sort: card.checklists().count(),
});
setTimeout(() => {
this.$('.add-checklist-item').last().click();
this.$('.add-checklist-item')
.last()
.click();
}, 100);
}
textarea.value = '';
@ -113,7 +117,11 @@ BlazeComponent.extendComponent({
},
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
deleteChecklist() {
@ -174,7 +182,8 @@ BlazeComponent.extendComponent({
},
};
return [{
return [
{
...events,
'submit .js-add-checklist': this.addChecklist,
'submit .js-edit-checklist-title': this.editChecklist,
@ -183,21 +192,26 @@ BlazeComponent.extendComponent({
'click .js-delete-checklist-item': this.deleteItem,
'click .confirm-checklist-delete': this.deleteChecklist,
keydown: this.pressKey,
}];
},
];
},
}).register('checklists');
Template.checklistDeleteDialog.onCreated(() => {
const $cardDetails = this.$('.card-details');
this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position
this.scrollState = {
position: $cardDetails.scrollTop(), //save current scroll position
top: false, //required for smooth scroll animation
};
//Callback's purpose is to only prevent scrolling after animation is complete
$cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; });
$cardDetails.animate({ scrollTop: 0 }, 500, () => {
this.scrollState.top = true;
});
//Prevent scrolling while dialog is open
$cardDetails.on('scroll', () => {
if(this.scrollState.top) { //If it's already in position, keep it there. Otherwise let animation scroll
if (this.scrollState.top) {
//If it's already in position, keep it there. Otherwise let animation scroll
$cardDetails.scrollTop(0);
}
});
@ -211,7 +225,11 @@ Template.checklistDeleteDialog.onDestroyed(() => {
Template.checklistItemDetail.helpers({
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
});
@ -224,8 +242,10 @@ BlazeComponent.extendComponent({
}
},
events() {
return [{
return [
{
'click .js-checklist-item .check-box': this.toggleItem,
}];
},
];
},
}).register('checklistItemDetail');

38
client/components/cards/labels.js
View file

@ -9,7 +9,7 @@ BlazeComponent.extendComponent({
},
labels() {
return labelColors.map((color) => ({ color, name: '' }));
return labelColors.map(color => ({ color, name: '' }));
},
isSelected(color) {
@ -17,11 +17,13 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-palette-color'() {
this.currentColor.set(this.currentData().color);
},
}];
},
];
},
}).register('formLabel');
@ -38,19 +40,19 @@ Template.createLabelPopup.helpers({
});
Template.cardLabelsPopup.events({
'click .js-select-label'(evt) {
'click .js-select-label'(event) {
const card = Cards.findOne(Session.get('currentCard'));
const labelId = this._id;
card.toggleLabel(labelId);
evt.preventDefault();
event.preventDefault();
},
'click .js-edit-label': Popup.open('editLabel'),
'click .js-add-label': Popup.open('createLabel'),
});
Template.formLabel.events({
'click .js-palette-color'(evt) {
const $this = $(evt.currentTarget);
'click .js-palette-color'(event) {
const $this = $(event.currentTarget);
// hide selected ll colors
$('.js-palette-select').addClass('hide');
@ -62,11 +64,14 @@ Template.formLabel.events({
Template.createLabelPopup.events({
// Create the new label
'submit .create-label'(evt, tpl) {
evt.preventDefault();
'submit .create-label'(event, templateInstance) {
event.preventDefault();
const board = Boards.findOne(Session.get('currentBoard'));
const name = tpl.$('#labelName').val().trim();
const color = Blaze.getData(tpl.find('.fa-check')).color;
const name = templateInstance
.$('#labelName')
.val()
.trim();
const color = Blaze.getData(templateInstance.find('.fa-check')).color;
board.addLabel(name, color);
Popup.back();
},
@ -78,11 +83,14 @@ Template.editLabelPopup.events({
board.removeLabel(this._id);
Popup.back(2);
}),
'submit .edit-label'(evt, tpl) {
evt.preventDefault();
'submit .edit-label'(event, templateInstance) {
event.preventDefault();
const board = Boards.findOne(Session.get('currentBoard'));
const name = tpl.$('#labelName').val().trim();
const color = Blaze.getData(tpl.find('.fa-check')).color;
const name = templateInstance
.$('#labelName')
.val()
.trim();
const color = Blaze.getData(templateInstance.find('.fa-check')).color;
board.editLabel(this._id, name, color);
Popup.back();
},

9
client/components/cards/minicard.js
View file

@ -8,13 +8,14 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-linked-link'() {
if (this.data().isLinkedCard())
Utils.goCardId(this.data().linkedId);
if (this.data().isLinkedCard()) Utils.goCardId(this.data().linkedId);
else if (this.data().isLinkedBoard())
Utils.goBoardId(this.data().linkedId);
},
}];
},
];
},
}).register('minicard');

40
client/components/cards/subtasks.js
View file

@ -1,11 +1,14 @@
BlazeComponent.extendComponent({
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
}).register('subtaskDetail');
BlazeComponent.extendComponent({
addSubtask(event) {
event.preventDefault();
const textarea = this.find('textarea.js-add-subtask-item');
@ -38,9 +41,10 @@ BlazeComponent.extendComponent({
// See https://github.com/wekan/wekan/issues/80
Filter.addException(_id);
setTimeout(() => {
this.$('.add-subtask-item').last().click();
this.$('.add-subtask-item')
.last()
.click();
}, 100);
}
textarea.value = '';
@ -48,7 +52,11 @@ BlazeComponent.extendComponent({
},
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
deleteSubtask() {
@ -103,27 +111,33 @@ BlazeComponent.extendComponent({
},
};
return [{
return [
{
...events,
'submit .js-add-subtask': this.addSubtask,
'submit .js-edit-subtask-title': this.editSubtask,
'click .confirm-subtask-delete': this.deleteSubtask,
keydown: this.pressKey,
}];
},
];
},
}).register('subtasks');
Template.subtaskDeleteDialog.onCreated(() => {
const $cardDetails = this.$('.card-details');
this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position
this.scrollState = {
position: $cardDetails.scrollTop(), //save current scroll position
top: false, //required for smooth scroll animation
};
//Callback's purpose is to only prevent scrolling after animation is complete
$cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; });
$cardDetails.animate({ scrollTop: 0 }, 500, () => {
this.scrollState.top = true;
});
//Prevent scrolling while dialog is open
$cardDetails.on('scroll', () => {
if(this.scrollState.top) { //If it's already in position, keep it there. Otherwise let animation scroll
if (this.scrollState.top) {
//If it's already in position, keep it there. Otherwise let animation scroll
$cardDetails.scrollTop(0);
}
});
@ -137,7 +151,11 @@ Template.subtaskDeleteDialog.onDestroyed(() => {
Template.subtaskItemDetail.helpers({
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
});

41
client/components/import/import.js
View file

@ -56,7 +56,7 @@ BlazeComponent.extendComponent({
const membersMapping = this.membersToMap.get();
if (membersMapping) {
const mappingById = {};
membersMapping.forEach((member) => {
membersMapping.forEach(member => {
if (member.wekanId) {
mappingById[member.id] = member.wekanId;
}
@ -64,7 +64,8 @@ BlazeComponent.extendComponent({
additionalData.membersMapping = mappingById;
}
this.membersToMap.set([]);
Meteor.call('importBoard',
Meteor.call(
'importBoard',
this.importedData.get(),
additionalData,
this.importSource,
@ -76,7 +77,7 @@ BlazeComponent.extendComponent({
Session.set('fromBoard', null);
Utils.goBoardId(res);
}
}
},
);
},
@ -109,18 +110,22 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
submit(evt) {
return this.parentComponent().importData(evt);
},
}];
},
];
},
}).register('importTextarea');
BlazeComponent.extendComponent({
onCreated() {
this.autorun(() => {
this.parentComponent().membersToMap.get().forEach(({ wekanId }) => {
this.parentComponent()
.membersToMap.get()
.forEach(({ wekanId }) => {
if (wekanId) {
this.subscribe('user-miniprofile', wekanId);
}
@ -150,11 +155,11 @@ BlazeComponent.extendComponent({
const listOfMembers = this.members();
let finder = null;
if (memberId) {
finder = (member) => member.id === memberId;
finder = member => member.id === memberId;
} else {
finder = (member) => member.selected;
finder = member => member.selected;
}
listOfMembers.forEach((member) => {
listOfMembers.forEach(member => {
if (finder(member)) {
if (value !== null) {
member[property] = value;
@ -186,9 +191,9 @@ BlazeComponent.extendComponent({
const allMembers = this.members();
let finder = null;
if (memberId) {
finder = (user) => user.id === memberId;
finder = user => user.id === memberId;
} else {
finder = (user) => user.selected;
finder = user => user.selected;
}
return allMembers.find(finder);
},
@ -218,10 +223,12 @@ BlazeComponent.extendComponent({
},
events() {
return [{
'submit': this.onSubmit,
return [
{
submit: this.onSubmit,
'click .js-select-member': this.onMapMember,
}];
},
];
},
}).register('importMapMembers');
@ -236,8 +243,10 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-select-import': this.onSelectUser,
}];
},
];
},
}).register('importMapMembersAddPopup');

2
client/components/import/trelloMembersMapper.js
View file

@ -4,7 +4,7 @@ export function getMembersToMap(data) {
// imported member
const membersToMap = data.members;
// auto-map based on username
membersToMap.forEach((importedMember) => {
membersToMap.forEach(importedMember => {
const wekanUser = Users.findOne({ username: importedMember.username });
if (wekanUser) {
importedMember.wekanId = wekanUser._id;

4
client/components/import/wekanMembersMapper.js
View file

@ -5,10 +5,10 @@ export function getMembersToMap(data) {
const membersToMap = data.members;
const users = data.users;
// auto-map based on username
membersToMap.forEach((importedMember) => {
membersToMap.forEach(importedMember => {
importedMember.id = importedMember.userId;
delete importedMember.userId;
const user = users.filter((user) => {
const user = users.filter(user => {
return user._id === importedMember.id;
})[0];
if (user.profile && user.profile.fullname) {

38
client/components/lists/list.js
View file

@ -21,7 +21,11 @@ BlazeComponent.extendComponent({
const boardComponent = this.parentComponent().parentComponent();
function userIsMember() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
}
const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)';
@ -42,10 +46,16 @@ BlazeComponent.extendComponent({
if (MultiSelection.isActive()) {
const andNOthers = $cards.find('.js-minicard.is-checked').length - 1;
if (andNOthers > 0) {
helper.append($(Blaze.toHTML(HTML.DIV(
{ 'class': 'and-n-other' },
TAPi18n.__('and-n-other-card', { count: andNOthers })
))));
helper.append(
$(
Blaze.toHTML(
HTML.DIV(
{ class: 'and-n-other' },
TAPi18n.__('and-n-other-card', { count: andNOthers }),
),
),
),
);
}
}
return helper;
@ -70,9 +80,16 @@ BlazeComponent.extendComponent({
const currentBoard = Boards.findOne(Session.get('currentBoard'));
let swimlaneId = '';
const boardView = (Meteor.user().profile || {}).boardView;
if (boardView === 'board-view-swimlanes' || currentBoard.isTemplatesBoard())
if (
boardView === 'board-view-swimlanes' ||
currentBoard.isTemplatesBoard()
)
swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id;
else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
else if (
boardView === 'board-view-lists' ||
boardView === 'board-view-cal' ||
!boardView
)
swimlaneId = currentBoard.getDefaultSwimline()._id;
// Normally the jquery-ui sortable library moves the dragged DOM element
@ -86,7 +103,12 @@ BlazeComponent.extendComponent({
if (MultiSelection.isActive()) {
Cards.find(MultiSelection.getMongoSelector()).forEach((card, i) => {
card.move(currentBoard._id, swimlaneId, listId, sortIndex.base + i * sortIndex.increment);
card.move(
currentBoard._id,
swimlaneId,
listId,
sortIndex.base + i * sortIndex.increment,
);
});
} else {
const cardDomElement = ui.item.get(0);

220
client/components/lists/listBody.js
View file

@ -16,7 +16,7 @@ BlazeComponent.extendComponent({
options.position = options.position || 'top';
const forms = this.childComponents('inlinedForm');
let form = forms.find((component) => {
let form = forms.find(component => {
return component.data().position === options.position;
});
if (!form && forms.length > 0) {
@ -52,11 +52,12 @@ BlazeComponent.extendComponent({
let cardType = 'cardType-card';
if (title) {
if (board.isTemplatesBoard()) {
swimlaneId = this.parentComponent().parentComponent().data()._id; // Always swimlanes view
swimlaneId = this.parentComponent()
.parentComponent()
.data()._id; // Always swimlanes view
const swimlane = Swimlanes.findOne(swimlaneId);
// If this is the card templates swimlane, insert a card template
if (swimlane.isCardTemplatesSwimlane())
cardType = 'template-card';
if (swimlane.isCardTemplatesSwimlane()) cardType = 'template-card';
// If this is the board templates swimlane, insert a board template and a linked card
else if (swimlane.isBoardTemplatesSwimlane()) {
linkedId = Boards.insert({
@ -71,8 +72,14 @@ BlazeComponent.extendComponent({
cardType = 'cardType-linkedBoard';
}
} else if (boardView === 'board-view-swimlanes')
swimlaneId = this.parentComponent().parentComponent().data()._id;
else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
swimlaneId = this.parentComponent()
.parentComponent()
.data()._id;
else if (
boardView === 'board-view-lists' ||
boardView === 'board-view-cal' ||
!boardView
)
swimlaneId = board.getDefaultSwimline()._id;
const _id = Cards.insert({
@ -91,7 +98,9 @@ BlazeComponent.extendComponent({
// if the displayed card count is less than the total cards in the list,
// we need to increment the displayed card count to prevent the spinner
// to appear
const cardCount = this.data().cards(this.idOrNull(swimlaneId)).count();
const cardCount = this.data()
.cards(this.idOrNull(swimlaneId))
.count();
if (this.cardlimit.get() < cardCount) {
this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
}
@ -149,8 +158,12 @@ BlazeComponent.extendComponent({
idOrNull(swimlaneId) {
const currentUser = Meteor.user();
if ((currentUser.profile || {}).boardView === 'board-view-swimlanes' ||
this.data().board().isTemplatesBoard())
if (
(currentUser.profile || {}).boardView === 'board-view-swimlanes' ||
this.data()
.board()
.isTemplatesBoard()
)
return swimlaneId;
return undefined;
},
@ -161,8 +174,7 @@ BlazeComponent.extendComponent({
listId: this.currentData()._id,
archived: false,
};
if (swimlaneId)
selector.swimlaneId = swimlaneId;
if (swimlaneId) selector.swimlaneId = swimlaneId;
return Cards.find(Filter.mongoSelector(selector), {
sort: ['sort'],
limit,
@ -175,21 +187,32 @@ BlazeComponent.extendComponent({
},
canSeeAddCard() {
return !this.reachedWipLimit() && Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
!this.reachedWipLimit() &&
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
reachedWipLimit() {
const list = Template.currentData();
return !list.getWipLimit('soft') && list.getWipLimit('enabled') && list.getWipLimit('value') <= list.cards().count();
return (
!list.getWipLimit('soft') &&
list.getWipLimit('enabled') &&
list.getWipLimit('value') <= list.cards().count()
);
},
events() {
return [{
return [
{
'click .js-minicard': this.clickOnMiniCard,
'click .js-toggle-multi-selection': this.toggleMultiSelection,
'click .open-minicard-composer': this.scrollToBottom,
submit: this.addCard,
}];
},
];
},
}).register('listBody');
@ -212,10 +235,15 @@ BlazeComponent.extendComponent({
const currentBoardId = Session.get('currentBoard');
arr = [];
_.forEach(Boards.findOne(currentBoardId).customFields().fetch(), function(field){
_.forEach(
Boards.findOne(currentBoardId)
.customFields()
.fetch(),
function(field) {
if (field.automaticallyOnCard)
arr.push({ _id: field._id, value: null });
});
},
);
this.customFields.set(arr);
},
@ -227,7 +255,7 @@ BlazeComponent.extendComponent({
getLabels() {
const currentBoardId = Session.get('currentBoard');
return Boards.findOne(currentBoardId).labels.filter((label) => {
return Boards.findOne(currentBoardId).labels.filter(label => {
return this.labels.get().indexOf(label._id) > -1;
});
},
@ -263,12 +291,14 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
keydown: this.pressKey,
'click .js-link': Popup.open('linkCard'),
'click .js-search': Popup.open('searchElement'),
'click .js-card-template': Popup.open('searchElement'),
}];
},
];
},
onRendered() {
@ -277,16 +307,19 @@ BlazeComponent.extendComponent({
autosize($textarea);
$textarea.escapeableTextComplete([
$textarea.escapeableTextComplete(
[
// User mentions
{
match: /\B@([\w.]*)$/,
search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
callback($.map(currentBoard.activeMembers(), (member) => {
callback(
$.map(currentBoard.activeMembers(), member => {
const user = Users.findOne(member.userId);
return user.username.indexOf(term) === 0 ? user : null;
}));
}),
);
},
template(user) {
return user.username;
@ -303,13 +336,17 @@ BlazeComponent.extendComponent({
match: /\B#(\w*)$/,
search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
callback($.map(currentBoard.labels, (label) => {
if (label.name.indexOf(term) > -1 ||
label.color.indexOf(term) > -1) {
callback(
$.map(currentBoard.labels, label => {
if (
label.name.indexOf(term) > -1 ||
label.color.indexOf(term) > -1
) {
return label;
}
return null;
}));
}),
);
},
template(label) {
return Blaze.toHTMLWithData(Template.autocompleteLabelLine, {
@ -324,7 +361,8 @@ BlazeComponent.extendComponent({
},
index: 1,
},
], {
],
{
// When the autocomplete menu is shown we want both a press of both `Tab`
// or `Enter` to validation the auto-completion. We also need to stop the
// event propagation to prevent the card from submitting (on `Enter`) or
@ -336,7 +374,8 @@ BlazeComponent.extendComponent({
}
return null;
},
});
},
);
},
}).register('addCardForm');
@ -354,7 +393,9 @@ BlazeComponent.extendComponent({
const list = $(Popup._getTopStack().openerElement).closest('.js-list');
this.listId = Blaze.getData(list[0])._id;
// Swimlane where to insert card
const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane');
const swimlane = $(Popup._getTopStack().openerElement).closest(
'.js-swimlane',
);
this.swimlaneId = '';
const boardView = (Meteor.user().profile || {}).boardView;
if (boardView === 'board-view-swimlanes')
@ -364,14 +405,17 @@ BlazeComponent.extendComponent({
},
boards() {
const boards = Boards.find({
const boards = Boards.find(
{
archived: false,
'members.userId': Meteor.userId(),
_id: { $ne: Session.get('currentBoard') },
type: 'board',
}, {
},
{
sort: ['title'],
});
},
);
return boards;
},
@ -390,8 +434,7 @@ BlazeComponent.extendComponent({
return [];
}
const lists = Lists.find({ boardId: this.selectedBoardId.get() });
if (lists.count())
this.selectedListId.set(lists.fetch()[0]._id);
if (lists.count()) this.selectedListId.set(lists.fetch()[0]._id);
return lists;
},
@ -399,7 +442,9 @@ BlazeComponent.extendComponent({
if (!this.board) {
return [];
}
const ownCardsIds = this.board.cards().map((card) => { return card.linkedId || card._id; });
const ownCardsIds = this.board.cards().map(card => {
return card.linkedId || card._id;
});
return Cards.find({
boardId: this.selectedBoardId.get(),
swimlaneId: this.selectedSwimlaneId.get(),
@ -412,7 +457,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'change .js-select-boards'(evt) {
subManager.subscribe('board', $(evt.currentTarget).val(), false);
this.selectedBoardId.set($(evt.currentTarget).val());
@ -437,7 +483,9 @@ BlazeComponent.extendComponent({
listId: this.listId,
swimlaneId: this.swimlaneId,
boardId: this.boardId,
sort: Lists.findOne(this.listId).cards().count(),
sort: Lists.findOne(this.listId)
.cards()
.count(),
type: 'cardType-linkedCard',
linkedId,
});
@ -449,7 +497,10 @@ BlazeComponent.extendComponent({
evt.stopPropagation();
evt.preventDefault();
const impBoardId = $('.js-select-boards option:selected').val();
if (!impBoardId || Cards.findOne({linkedId: impBoardId, archived: false})) {
if (
!impBoardId ||
Cards.findOne({ linkedId: impBoardId, archived: false })
) {
Popup.close();
return;
}
@ -458,14 +509,17 @@ BlazeComponent.extendComponent({
listId: this.listId,
swimlaneId: this.swimlaneId,
boardId: this.boardId,
sort: Lists.findOne(this.listId).cards().count(),
sort: Lists.findOne(this.listId)
.cards()
.count(),
type: 'cardType-linkedBoard',
linkedId: impBoardId,
});
Filter.addException(_id);
Popup.close();
},
}];
},
];
},
}).register('linkCardPopup');
@ -475,11 +529,20 @@ BlazeComponent.extendComponent({
},
onCreated() {
this.isCardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-card-template');
this.isListTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-list-template');
this.isSwimlaneTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-open-add-swimlane-menu');
this.isBoardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-add-board');
this.isTemplateSearch = this.isCardTemplateSearch ||
this.isCardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass(
'js-card-template',
);
this.isListTemplateSearch = $(Popup._getTopStack().openerElement).hasClass(
'js-list-template',
);
this.isSwimlaneTemplateSearch = $(
Popup._getTopStack().openerElement,
).hasClass('js-open-add-swimlane-menu');
this.isBoardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass(
'js-add-board',
);
this.isTemplateSearch =
this.isCardTemplateSearch ||
this.isListTemplateSearch ||
this.isSwimlaneTemplateSearch ||
this.isBoardTemplateSearch;
@ -491,7 +554,12 @@ BlazeComponent.extendComponent({
board = Boards.findOne({
archived: false,
'members.userId': Meteor.userId(),
_id: {$nin: [Session.get('currentBoard'), (Meteor.user().profile || {}).templatesBoardId]},
_id: {
$nin: [
Session.get('currentBoard'),
(Meteor.user().profile || {}).templatesBoardId,
],
},
});
}
if (!board) {
@ -509,11 +577,12 @@ BlazeComponent.extendComponent({
subManager.subscribe('board', this.boardId, false);
this.swimlaneId = '';
// Swimlane where to insert card
const swimlane = $(Popup._getTopStack().openerElement).parents('.js-swimlane');
const swimlane = $(Popup._getTopStack().openerElement).parents(
'.js-swimlane',
);
if ((Meteor.user().profile || {}).boardView === 'board-view-swimlanes')
this.swimlaneId = Blaze.getData(swimlane[0])._id;
else
this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
else this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
// List where to insert card
const list = $(Popup._getTopStack().openerElement).closest('.js-list');
this.listId = Blaze.getData(list[0])._id;
@ -522,14 +591,17 @@ BlazeComponent.extendComponent({
},
boards() {
const boards = Boards.find({
const boards = Boards.find(
{
archived: false,
'members.userId': Meteor.userId(),
_id: { $ne: Session.get('currentBoard') },
type: 'board',
}, {
},
{
sort: ['title'],
});
},
);
return boards;
},
@ -546,7 +618,7 @@ BlazeComponent.extendComponent({
return board.searchSwimlanes(this.term.get());
} else if (this.isBoardTemplateSearch) {
const boards = board.searchBoards(this.term.get());
boards.forEach((board) => {
boards.forEach(board => {
subManager.subscribe('board', board.linkedId, false);
});
return boards;
@ -556,7 +628,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'change .js-select-boards'(evt) {
subManager.subscribe('board', $(evt.currentTarget).val(), false);
this.selectedBoardId.set($(evt.currentTarget).val());
@ -567,16 +640,19 @@ BlazeComponent.extendComponent({
},
'click .js-minicard'(evt) {
// 0. Common
const title = $('.js-element-title').val().trim();
if (!title)
return;
const title = $('.js-element-title')
.val()
.trim();
if (!title) return;
const element = Blaze.getData(evt.currentTarget);
element.title = title;
let _id = '';
if (!this.isTemplateSearch || this.isCardTemplateSearch) {
// Card insertion
// 1. Common
element.sort = Lists.findOne(this.listId).cards().count();
element.sort = Lists.findOne(this.listId)
.cards()
.count();
// 1.A From template
if (this.isTemplateSearch) {
element.type = 'cardType-card';
@ -592,11 +668,15 @@ BlazeComponent.extendComponent({
Filter.addException(_id);
// List insertion
} else if (this.isListTemplateSearch) {
element.sort = Swimlanes.findOne(this.swimlaneId).lists().count();
element.sort = Swimlanes.findOne(this.swimlaneId)
.lists()
.count();
element.type = 'list';
_id = element.copy(this.boardId, this.swimlaneId);
} else if (this.isSwimlaneTemplateSearch) {
element.sort = Boards.findOne(this.boardId).swimlanes().count();
element.sort = Boards.findOne(this.boardId)
.swimlanes()
.count();
element.type = 'swimlalne';
_id = element.copy(this.boardId);
} else if (this.isBoardTemplateSearch) {
@ -609,7 +689,8 @@ BlazeComponent.extendComponent({
}
Popup.close();
},
}];
},
];
},
}).register('searchElementPopup');
@ -622,15 +703,23 @@ BlazeComponent.extendComponent({
const boardView = (Meteor.user().profile || {}).boardView;
if (boardView === 'board-view-swimlanes')
this.swimlaneId = this.parentComponent().parentComponent().parentComponent().data()._id;
this.swimlaneId = this.parentComponent()
.parentComponent()
.parentComponent()
.data()._id;
},
onRendered() {
this.spinner = this.find('.sk-spinner-list');
this.container = this.$(this.spinner).parents('.js-perfect-scrollbar')[0];
$(this.container).on(`scroll.spinner_${this.swimlaneId}_${this.listId}`, () => this.updateList());
$(window).on(`resize.spinner_${this.swimlaneId}_${this.listId}`, () => this.updateList());
$(this.container).on(
`scroll.spinner_${this.swimlaneId}_${this.listId}`,
() => this.updateList(),
);
$(window).on(`resize.spinner_${this.swimlaneId}_${this.listId}`, () =>
this.updateList(),
);
this.updateList();
},
@ -660,5 +749,4 @@ BlazeComponent.extendComponent({
return bottomViewPosition > threshold;
},
}).register('spinnerList');

78
client/components/lists/listHeader.js
View file

@ -6,12 +6,18 @@ Meteor.startup(() => {
BlazeComponent.extendComponent({
canSeeAddCard() {
const list = Template.currentData();
return !list.getWipLimit('enabled') || list.getWipLimit('soft') || !this.reachedWipLimit();
return (
!list.getWipLimit('enabled') ||
list.getWipLimit('soft') ||
!this.reachedWipLimit()
);
},
editTitle(evt) {
evt.preventDefault();
const newTitle = this.childComponents('inlinedForm')[0].getValue().trim();
editTitle(event) {
event.preventDefault();
const newTitle = this.childComponents('inlinedForm')[0]
.getValue()
.trim();
const list = this.currentData();
if (newTitle) {
list.rename(newTitle.trim());
@ -32,14 +38,19 @@ BlazeComponent.extendComponent({
let swimlaneId = '';
const boardView = (Meteor.user().profile || {}).boardView;
if (boardView === 'board-view-swimlanes')
swimlaneId = this.parentComponent().parentComponent().data()._id;
swimlaneId = this.parentComponent()
.parentComponent()
.data()._id;
return list.cards(swimlaneId).count();
},
reachedWipLimit() {
const list = Template.currentData();
return list.getWipLimit('enabled') && list.getWipLimit('value') <= list.cards().count();
return (
list.getWipLimit('enabled') &&
list.getWipLimit('value') <= list.cards().count()
);
},
showCardsCountForList(count) {
@ -48,10 +59,13 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-open-list-menu': Popup.open('listAction'),
'click .js-add-card' (evt) {
const listDom = $(evt.target).parents(`#js-list-${this.currentData()._id}`)[0];
'click .js-add-card'(event) {
const listDom = $(event.target).parents(
`#js-list-${this.currentData()._id}`,
)[0];
const listComponent = BlazeComponent.getComponentForElement(listDom);
listComponent.openForm({
position: 'top',
@ -61,7 +75,8 @@ BlazeComponent.extendComponent({
Session.set('currentList', null);
},
submit: this.editTitle,
}];
},
];
},
}).register('listHeader');
@ -79,7 +94,7 @@ Template.listActionPopup.events({
'click .js-list-subscribe'() {},
'click .js-set-color-list': Popup.open('setListColor'),
'click .js-select-cards'() {
const cardIds = this.allCards().map((card) => card._id);
const cardIds = this.allCards().map(card => card._id);
MultiSelection.add(cardIds);
Popup.close();
},
@ -90,8 +105,8 @@ Template.listActionPopup.events({
if (!err && ret) Popup.close();
});
},
'click .js-close-list' (evt) {
evt.preventDefault();
'click .js-close-list'(event) {
event.preventDefault();
this.archive();
Popup.close();
},
@ -102,10 +117,17 @@ Template.listActionPopup.events({
BlazeComponent.extendComponent({
applyWipLimit() {
const list = Template.currentData();
const limit = parseInt(Template.instance().$('.wip-limit-value').val(), 10);
const limit = parseInt(
Template.instance()
.$('.wip-limit-value')
.val(),
10,
);
if (limit < list.cards().count() && !list.getWipLimit('soft')) {
Template.instance().$('.wip-limit-error').click();
Template.instance()
.$('.wip-limit-error')
.click();
} else {
Meteor.call('applyWipLimit', list._id, limit);
Popup.back();
@ -115,7 +137,10 @@ BlazeComponent.extendComponent({
enableSoftLimit() {
const list = Template.currentData();
if(list.getWipLimit('soft') && list.getWipLimit('value') < list.cards().count()){
if (
list.getWipLimit('soft') &&
list.getWipLimit('value') < list.cards().count()
) {
list.setWipLimit(list.cards().count());
}
Meteor.call('enableSoftLimit', Template.currentData()._id);
@ -124,7 +149,10 @@ BlazeComponent.extendComponent({
enableWipLimit() {
const list = Template.currentData();
// Prevent user from using previously stored wipLimit.value if it is less than the current number of cards in the list
if(!list.getWipLimit('enabled') && list.getWipLimit('value') < list.cards().count()){
if (
!list.getWipLimit('enabled') &&
list.getWipLimit('value') < list.cards().count()
) {
list.setWipLimit(list.cards().count());
}
Meteor.call('enableWipLimit', list._id);
@ -143,19 +171,21 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-enable-wip-limit': this.enableWipLimit,
'click .wip-limit-apply': this.applyWipLimit,
'click .wip-limit-error': Popup.open('wipLimitError'),
'click .materialCheckBox': this.enableSoftLimit,
}];
},
];
},
}).register('setWipLimitPopup');
Template.listMorePopup.events({
'click .js-delete': Popup.afterConfirm('listDelete', function() {
Popup.close();
this.allCards().map((card) => Cards.remove(card._id));
this.allCards().map(card => Cards.remove(card._id));
Lists.remove(this._id);
Utils.goBoardId(this.boardId);
}),
@ -168,7 +198,7 @@ BlazeComponent.extendComponent({
},
colors() {
return listsColors.map((color) => ({ color, name: '' }));
return listsColors.map(color => ({ color, name: '' }));
},
isSelected(color) {
@ -176,7 +206,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-palette-color'() {
this.currentColor.set(this.currentData().color);
},
@ -188,6 +219,7 @@ BlazeComponent.extendComponent({
this.currentList.setColor(null);
Popup.close();
},
}];
},
];
},
}).register('setListColorPopup');

45
client/components/main/editor.js
View file

@ -9,10 +9,15 @@ Template.editor.onRendered(() => {
match: /\B@([\w.]*)$/,
search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
callback(currentBoard.activeMembers().map((member) => {
callback(
currentBoard
.activeMembers()
.map(member => {
const username = Users.findOne(member.userId).username;
return username.includes(term) ? username : null;
}).filter(Boolean));
})
.filter(Boolean),
);
},
template(value) {
return value;
@ -34,13 +39,14 @@ import sanitizeXss from 'xss';
// In the meantime, all the transformation are done on the client using the
// Blaze API.
const at = HTML.CharRef({ html: '&commat;', str: '@' });
Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
Blaze.Template.registerHelper(
'mentions',
new Template('mentions', function() {
const view = this;
let content = Blaze.toHTML(view.templateContentBlock);
const currentBoard = Boards.findOne(Session.get('currentBoard'));
if (!currentBoard)
return HTML.Raw(sanitizeXss(content));
const knowedUsers = currentBoard.members.map((member) => {
if (!currentBoard) return HTML.Raw(sanitizeXss(content));
const knowedUsers = currentBoard.members.map(member => {
const u = Users.findOne(member.userId);
if (u) {
member.username = u.username;
@ -62,40 +68,43 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
if (knowedUser.userId === Meteor.userId()) {
linkClass += ' me';
}
const link = HTML.A({
'class': linkClass,
const link = HTML.A(
{
class: linkClass,
// XXX Hack. Since we stringify this render function result below with
// `Blaze.toHTML` we can't rely on blaze data contexts to pass the
// `userId` to the popup as usual, and we need to store it in the DOM
// using a data attribute.
'data-userId': knowedUser.userId,
}, linkValue);
},
linkValue,
);
content = content.replace(fullMention, Blaze.toHTML(link));
}
return HTML.Raw(sanitizeXss(content));
}));
}),
);
Template.viewer.events({
// Viewer sometimes have click-able wrapper around them (for instance to edit
// the corresponding text). Clicking a link shouldn't fire these actions, stop
// we stop these event at the viewer component level.
'click a'(evt, tpl) {
evt.stopPropagation();
'click a'(event, templateInstance) {
event.stopPropagation();
// XXX We hijack the build-in browser action because we currently don't have
// `_blank` attributes in viewer links, and the transformer function is
// handled by a third party package that we can't configure easily. Fix that
// by using directly `_blank` attribute in the rendered HTML.
evt.preventDefault();
event.preventDefault();
const userId = evt.currentTarget.dataset.userid;
const userId = event.currentTarget.dataset.userid;
if (userId) {
Popup.open('member').call({ userId }, evt, tpl);
}
else {
const href = evt.currentTarget.href;
Popup.open('member').call({ userId }, event, templateInstance);
} else {
const href = event.currentTarget.href;
if (href) {
window.open(href, '_blank');
}

48
client/components/main/layouts.js
View file

@ -1,6 +1,6 @@
BlazeLayout.setRoot('body');
const i18nTagToT9n = (i18nTag) => {
const i18nTagToT9n = i18nTag => {
// t9n/i18n tags are same now, see: https://github.com/softwarerero/meteor-accounts-t9n/pull/129
// but we keep this conversion function here, to be aware that that they are different system.
return i18nTag;
@ -21,20 +21,23 @@ const validator = {
};
Template.userFormsLayout.onCreated(function() {
const instance = this;
instance.currentSetting = new ReactiveVar();
instance.isLoading = new ReactiveVar(false);
const templateInstance = this;
templateInstance.currentSetting = new ReactiveVar();
templateInstance.isLoading = new ReactiveVar(false);
Meteor.subscribe('setting', {
onReady() {
instance.currentSetting.set(Settings.findOne());
templateInstance.currentSetting.set(Settings.findOne());
return this.stop();
},
});
});
Template.userFormsLayout.onRendered(() => {
AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);
AccountsTemplates.state.form.keys = new Proxy(
AccountsTemplates.state.form.keys,
validator,
);
const i18nTag = navigator.language;
if (i18nTag) {
@ -89,17 +92,16 @@ Template.userFormsLayout.helpers({
});
Template.userFormsLayout.events({
'change .js-userform-set-language'(evt) {
const i18nTag = $(evt.currentTarget).val();
'change .js-userform-set-language'(event) {
const i18nTag = $(event.currentTarget).val();
T9n.setLanguage(i18nTagToT9n(i18nTag));
evt.preventDefault();
event.preventDefault();
},
'click #at-btn'(event, instance) {
'click #at-btn'(event, templateInstance) {
if (FlowRouter.getRouteName() === 'atSignIn') {
instance.isLoading.set(true);
authentication(event, instance)
.then(() => {
instance.isLoading.set(false);
templateInstance.isLoading.set(true);
authentication(event, templateInstance).then(() => {
templateInstance.isLoading.set(false);
});
}
},
@ -111,13 +113,16 @@ Template.defaultLayout.events({
},
});
async function authentication(event, instance) {
async function authentication(event, templateInstance) {
const match = $('#at-field-username_and_email').val();
const password = $('#at-field-password').val();
if (!match || !password) return undefined;
const result = await getAuthenticationMethod(instance.currentSetting.get(), match);
const result = await getAuthenticationMethod(
templateInstance.currentSetting.get(),
match,
);
if (result === 'password') return undefined;
@ -127,14 +132,14 @@ async function authentication(event, instance) {
switch (result) {
case 'ldap':
return new Promise((resolve) => {
return new Promise(resolve => {
Meteor.loginWithLDAP(match, password, function() {
resolve(FlowRouter.go('/'));
});
});
case 'cas':
return new Promise((resolve) => {
return new Promise(resolve => {
Meteor.loginWithCas(match, password, function() {
resolve(FlowRouter.go('/'));
});
@ -145,7 +150,10 @@ async function authentication(event, instance) {
}
}
function getAuthenticationMethod({displayAuthenticationMethod, defaultAuthenticationMethod}, match) {
function getAuthenticationMethod(
{ displayAuthenticationMethod, defaultAuthenticationMethod },
match,
) {
if (displayAuthenticationMethod) {
return $('.select-authentication').val();
}
@ -153,7 +161,7 @@ function getAuthenticationMethod({displayAuthenticationMethod, defaultAuthentica
}
function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
return new Promise((resolve) => {
return new Promise(resolve => {
try {
Meteor.subscribe('user-authenticationMethod', match, {
onReady() {

6
client/components/mixins/infiniteScrolling.js
View file

@ -18,7 +18,8 @@ Mixins.InfiniteScrolling = BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
scroll(evt) {
const domElement = evt.currentTarget;
let altitude = domElement.scrollTop + domElement.offsetHeight;
@ -27,6 +28,7 @@ Mixins.InfiniteScrolling = BlazeComponent.extendComponent({
this.mixinParent().callFirstWith(null, 'reachNextPeak');
}
},
}];
},
];
},
});

17
client/components/rules/actions/boardActions.js
View file

@ -1,10 +1,9 @@
BlazeComponent.extendComponent({
onCreated() {
},
onCreated() {},
events() {
return [{
return [
{
'click .js-create-card-action'(event) {
const ruleName = this.data().ruleName.get();
const trigger = this.data().triggerVar.get();
@ -28,7 +27,6 @@ BlazeComponent.extendComponent({
actionId,
boardId,
});
},
'click .js-add-swimlane-action'(event) {
const ruleName = this.data().ruleName.get();
@ -49,7 +47,6 @@ BlazeComponent.extendComponent({
actionId,
boardId,
});
},
'click .js-add-spec-move-action'(event) {
const ruleName = this.data().ruleName.get();
@ -99,7 +96,7 @@ BlazeComponent.extendComponent({
const triggerId = Triggers.insert(trigger);
const actionId = Actions.insert({
actionType: 'moveCardToTop',
'listTitle': '*',
listTitle: '*',
boardId,
desc,
});
@ -114,7 +111,7 @@ BlazeComponent.extendComponent({
const triggerId = Triggers.insert(trigger);
const actionId = Actions.insert({
actionType: 'moveCardToBottom',
'listTitle': '*',
listTitle: '*',
boardId,
desc,
});
@ -161,8 +158,8 @@ BlazeComponent.extendComponent({
});
}
},
}];
},
];
},
}).register('boardActions');
/* eslint-no-undef */

21
client/components/rules/actions/cardActions.js
View file

@ -28,7 +28,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-set-date-action'(event) {
const ruleName = this.data().ruleName.get();
const trigger = this.data().triggerVar.get();
@ -58,7 +59,8 @@ BlazeComponent.extendComponent({
const ruleName = this.data().ruleName.get();
const trigger = this.data().triggerVar.get();
const triggerId = Triggers.insert(trigger);
const dateFieldSelected = this.find('#setdate-removedatefieldvalue').value;
const dateFieldSelected = this.find('#setdate-removedatefieldvalue')
.value;
const boardId = Session.get('currentBoard');
const desc = Utils.getTriggerActionDesc(event, this);
@ -114,7 +116,6 @@ BlazeComponent.extendComponent({
boardId,
});
}
},
'click .js-add-member-action'(event) {
const ruleName = this.data().ruleName.get();
@ -163,7 +164,7 @@ BlazeComponent.extendComponent({
const boardId = Session.get('currentBoard');
const actionId = Actions.insert({
actionType: 'removeMember',
'username': '*',
username: '*',
boardId,
desc,
});
@ -202,9 +203,9 @@ BlazeComponent.extendComponent({
boardId,
});
},
}];
},
];
},
}).register('cardActions');
BlazeComponent.extendComponent({
@ -215,7 +216,7 @@ BlazeComponent.extendComponent({
},
colors() {
return cardColors.map((color) => ({ color, name: '' }));
return cardColors.map(color => ({ color, name: '' }));
},
isSelected(color) {
@ -223,7 +224,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-palette-color'() {
this.currentColor.set(this.currentData().color);
},
@ -231,6 +233,7 @@ BlazeComponent.extendComponent({
this.colorButtonValue.set(this.currentColor.get());
Popup.close();
},
}];
},
];
},
}).register('setCardActionsColorPopup');

9
client/components/rules/actions/checklistActions.js
View file

@ -3,7 +3,8 @@ BlazeComponent.extendComponent({
this.subscribe('allRules');
},
events() {
return [{
return [
{
'click .js-add-checklist-items-action'(event) {
const ruleName = this.data().ruleName.get();
const trigger = this.data().triggerVar.get();
@ -25,7 +26,6 @@ BlazeComponent.extendComponent({
actionId,
boardId,
});
},
'click .js-add-checklist-action'(event) {
const ruleName = this.data().ruleName.get();
@ -64,7 +64,6 @@ BlazeComponent.extendComponent({
boardId,
});
}
},
'click .js-add-checkall-action'(event) {
const ruleName = this.data().ruleName.get();
@ -145,7 +144,7 @@ BlazeComponent.extendComponent({
});
}
},
}];
},
];
},
}).register('checklistActions');

11
client/components/rules/actions/mailActions.js
View file

@ -1,10 +1,9 @@
BlazeComponent.extendComponent({
onCreated() {
},
onCreated() {},
events() {
return [{
return [
{
'click .js-mail-action'(event) {
const emailTo = this.find('#email-to').value;
const emailSubject = this.find('#email-subject').value;
@ -29,7 +28,7 @@ BlazeComponent.extendComponent({
boardId,
});
},
}];
},
];
},
}).register('mailActions');

2
client/components/rules/ruleDetails.js
View file

@ -3,7 +3,6 @@ BlazeComponent.extendComponent({
this.subscribe('allRules');
this.subscribe('allTriggers');
this.subscribe('allActions');
},
trigger() {
@ -34,5 +33,4 @@ BlazeComponent.extendComponent({
events() {
return [{}];
},
}).register('ruleDetails');

6
client/components/rules/rulesActions.js
View file

@ -40,7 +40,8 @@ BlazeComponent.extendComponent({
// console.log(this.data());
},
events() {
return [{
return [
{
'click .js-set-board-actions'() {
this.setBoardActions();
},
@ -53,6 +54,7 @@ BlazeComponent.extendComponent({
'click .js-set-checklist-actions'() {
this.setChecklistActions();
},
}];
},
];
},
}).register('rulesActions');

30
client/components/rules/rulesMain.js
View file

@ -10,11 +10,11 @@ BlazeComponent.extendComponent({
this.rulesCurrentTab.set('trigger');
},
sanitizeObject(obj) {
Object.keys(obj).forEach((key) => {
Object.keys(obj).forEach(key => {
if (obj[key] === '' || obj[key] === undefined) {
obj[key] = '*';
}}
);
}
});
},
setRulesList() {
this.rulesCurrentTab.set('rulesList');
@ -29,13 +29,13 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-delete-rule'() {
const rule = this.currentData();
Rules.remove(rule._id);
Actions.remove(rule.actionId);
Triggers.remove(rule.triggerId);
},
'click .js-goto-trigger'(event) {
event.preventDefault();
@ -49,7 +49,9 @@ 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 = '*';
if (username !== undefined) {
@ -67,7 +69,9 @@ BlazeComponent.extendComponent({
},
'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();
@ -75,7 +79,10 @@ BlazeComponent.extendComponent({
},
'click .js-goback'(event) {
event.preventDefault();
if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){
if (
this.rulesCurrentTab.get() === 'trigger' ||
this.rulesCurrentTab.get() === 'ruleDetails'
) {
this.setRulesList();
}
if (this.rulesCurrentTab.get() === 'action') {
@ -88,10 +95,7 @@ BlazeComponent.extendComponent({
this.ruleId.set(rule._id);
this.setRuleDetails();
},
}];
},
];
},
}).register('rulesMain');

6
client/components/rules/rulesTriggers.js
View file

@ -38,7 +38,8 @@ BlazeComponent.extendComponent({
// console.log(this.data());
},
events() {
return [{
return [
{
'click .js-set-board-triggers'() {
this.setBoardTriggers();
},
@ -48,6 +49,7 @@ BlazeComponent.extendComponent({
'click .js-set-checklist-triggers'() {
this.setChecklistTriggers();
},
}];
},
];
},
}).register('rulesTriggers');

32
client/components/rules/triggers/boardTriggers.js
View file

@ -9,7 +9,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-open-card-title-popup'(event) {
const funct = Popup.open('boardCardTitle');
const divId = $(event.currentTarget.parentNode.parentNode).attr('id');
@ -52,7 +53,7 @@ BlazeComponent.extendComponent({
listName,
cardTitle,
swimlaneName,
'oldListName': '*',
oldListName: '*',
desc,
});
}
@ -62,8 +63,8 @@ BlazeComponent.extendComponent({
boardId,
cardTitle,
swimlaneName,
'listName': '*',
'oldListName': listName,
listName: '*',
oldListName: listName,
desc,
});
}
@ -74,11 +75,11 @@ BlazeComponent.extendComponent({
const boardId = Session.get('currentBoard');
datas.triggerVar.set({
'activityType': 'moveCard',
activityType: 'moveCard',
boardId,
'swimlaneName': '*',
'listName':'*',
'oldListName': '*',
swimlaneName: '*',
listName: '*',
oldListName: '*',
desc,
});
},
@ -102,18 +103,19 @@ BlazeComponent.extendComponent({
});
}
},
}];
},
];
},
}).register('boardTriggers');
Template.boardCardTitlePopup.events({
submit(evt, tpl) {
const title = tpl.$('.js-card-filter-name').val().trim();
submit(event, templateInstance) {
const title = templateInstance
.$('.js-card-filter-name')
.val()
.trim();
Popup.getOpenerComponent().setNameFilter(title);
evt.preventDefault();
event.preventDefault();
Popup.close();
},
});

14
client/components/rules/triggers/cardTriggers.js
View file

@ -15,7 +15,8 @@ BlazeComponent.extendComponent({
return labels;
},
events() {
return [{
return [
{
'click .js-add-gen-label-trigger'(event) {
const desc = Utils.getTriggerActionDesc(event, this);
const datas = this.data();
@ -25,7 +26,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'addedLabel',
boardId,
'labelId': '*',
labelId: '*',
desc,
});
}
@ -33,7 +34,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'removedLabel',
boardId,
'labelId': '*',
labelId: '*',
desc,
});
}
@ -70,7 +71,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'joinMember',
boardId,
'username': '*',
username: '*',
desc,
});
}
@ -78,7 +79,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'unjoinMember',
boardId,
'username': '*',
username: '*',
desc,
});
}
@ -126,6 +127,7 @@ BlazeComponent.extendComponent({
});
}
},
}];
},
];
},
}).register('cardTriggers');

31
client/components/rules/triggers/checklistTriggers.js
View file

@ -3,7 +3,8 @@ BlazeComponent.extendComponent({
this.subscribe('allRules');
},
events() {
return [{
return [
{
'click .js-add-gen-check-trigger'(event) {
const desc = Utils.getTriggerActionDesc(event, this);
const datas = this.data();
@ -13,7 +14,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'addChecklist',
boardId,
'checklistName': '*',
checklistName: '*',
desc,
});
}
@ -21,7 +22,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'removeChecklist',
boardId,
'checklistName': '*',
checklistName: '*',
desc,
});
}
@ -36,7 +37,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'addChecklist',
boardId,
'checklistName': checklistId,
checklistName: checklistId,
desc,
});
}
@ -44,7 +45,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'removeChecklist',
boardId,
'checklistName': checklistId,
checklistName: checklistId,
desc,
});
}
@ -59,7 +60,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'completeChecklist',
boardId,
'checklistName': '*',
checklistName: '*',
desc,
});
}
@ -67,7 +68,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'uncompleteChecklist',
boardId,
'checklistName': '*',
checklistName: '*',
desc,
});
}
@ -82,7 +83,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'completeChecklist',
boardId,
'checklistName': checklistId,
checklistName: checklistId,
desc,
});
}
@ -90,7 +91,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'uncompleteChecklist',
boardId,
'checklistName': checklistId,
checklistName: checklistId,
desc,
});
}
@ -104,7 +105,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'checkedItem',
boardId,
'checklistItemName': '*',
checklistItemName: '*',
desc,
});
}
@ -112,7 +113,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'uncheckedItem',
boardId,
'checklistItemName': '*',
checklistItemName: '*',
desc,
});
}
@ -127,7 +128,7 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'checkedItem',
boardId,
'checklistItemName': checklistItemId,
checklistItemName: checklistItemId,
desc,
});
}
@ -135,12 +136,12 @@ BlazeComponent.extendComponent({
datas.triggerVar.set({
activityType: 'uncheckedItem',
boardId,
'checklistItemName': checklistItemId,
checklistItemName: checklistItemId,
desc,
});
}
},
}];
},
];
},
}).register('checklistTriggers');

8
client/components/settings/connectionMethod.js
View file

@ -8,7 +8,9 @@ Template.connectionMethod.onCreated(function() {
this.authenticationMethods.set([
{ value: 'password' },
// Gets only the authentication methods availables
...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
...Object.entries(result)
.filter(e => e[1])
.map(e => ({ value: e[0] })),
]);
}
@ -24,7 +26,9 @@ Template.connectionMethod.onCreated(function() {
Template.connectionMethod.onRendered(() => {
// Moves the select boxe in the first place of the at-pwd-form div
$('.at-form-authentication').detach().prependTo('.at-pwd-form');
$('.at-form-authentication')
.detach()
.prependTo('.at-pwd-form');
});
Template.connectionMethod.helpers({

74
client/components/settings/peopleBody.js
View file

@ -29,7 +29,8 @@ BlazeComponent.extendComponent({
});
},
events() {
return [{
return [
{
'click #searchButton'() {
this.filterPeople();
},
@ -38,10 +39,13 @@ BlazeComponent.extendComponent({
this.filterPeople();
}
},
}];
},
];
},
filterPeople() {
const value = $('#searchInput').first().val();
const value = $('#searchInput')
.first()
.val();
if (value === '') {
this.findUsersOptions.set({});
} else {
@ -107,7 +111,9 @@ Template.editUserPopup.onCreated(function() {
this.authenticationMethods.set([
{ value: 'password' },
// Gets only the authentication methods availables
...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
...Object.entries(result)
.filter(e => e[1])
.map(e => ({ value: e[0] })),
]);
}
});
@ -136,40 +142,44 @@ Template.editUserPopup.helpers({
});
BlazeComponent.extendComponent({
onCreated() {
},
onCreated() {},
user() {
return Users.findOne(this.userId);
},
events() {
return [{
return [
{
'click a.edit-user': Popup.open('editUser'),
}];
},
];
},
}).register('peopleRow');
Template.editUserPopup.events({
submit(evt, tpl) {
evt.preventDefault();
submit(event, templateInstance) {
event.preventDefault();
const user = Users.findOne(this.userId);
const fullname = tpl.find('.js-profile-fullname').value.trim();
const username = tpl.find('.js-profile-username').value.trim();
const password = tpl.find('.js-profile-password').value;
const isAdmin = tpl.find('.js-profile-isadmin').value.trim();
const isActive = tpl.find('.js-profile-isactive').value.trim();
const email = tpl.find('.js-profile-email').value.trim();
const authentication = tpl.find('.js-authenticationMethod').value.trim();
const fullname = templateInstance.find('.js-profile-fullname').value.trim();
const username = templateInstance.find('.js-profile-username').value.trim();
const password = templateInstance.find('.js-profile-password').value;
const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim();
const isActive = templateInstance.find('.js-profile-isactive').value.trim();
const email = templateInstance.find('.js-profile-email').value.trim();
const authentication = templateInstance
.find('.js-authenticationMethod')
.value.trim();
const isChangePassword = password.length > 0;
const isChangeUserName = username !== user.username;
const isChangeEmail = email.toLowerCase() !== user.emails[0].address.toLowerCase();
const isChangeEmail =
email.toLowerCase() !== user.emails[0].address.toLowerCase();
Users.update(this.userId, {
$set: {
'profile.fullname': fullname,
'isAdmin': isAdmin === 'true',
'loginDisabled': isActive === 'true',
'authenticationMethod': authentication,
isAdmin: isAdmin === 'true',
loginDisabled: isActive === 'true',
authenticationMethod: authentication,
},
});
@ -178,9 +188,14 @@ Template.editUserPopup.events({
}
if (isChangeUserName && isChangeEmail) {
Meteor.call('setUsernameAndEmail', username, email.toLowerCase(), this.userId, function (error) {
const usernameMessageElement = tpl.$('.username-taken');
const emailMessageElement = tpl.$('.email-taken');
Meteor.call(
'setUsernameAndEmail',
username,
email.toLowerCase(),
this.userId,
function(error) {
const usernameMessageElement = templateInstance.$('.username-taken');
const emailMessageElement = templateInstance.$('.email-taken');
if (error) {
const errorElement = error.error;
if (errorElement === 'username-already-taken') {
@ -195,10 +210,11 @@ Template.editUserPopup.events({
emailMessageElement.hide();
Popup.close();
}
});
},
);
} else if (isChangeUserName) {
Meteor.call('setUsername', username, this.userId, function(error) {
const usernameMessageElement = tpl.$('.username-taken');
const usernameMessageElement = templateInstance.$('.username-taken');
if (error) {
const errorElement = error.error;
if (errorElement === 'username-already-taken') {
@ -210,8 +226,10 @@ Template.editUserPopup.events({
}
});
} else if (isChangeEmail) {
Meteor.call('setEmail', email.toLowerCase(), this.userId, function (error) {
const emailMessageElement = tpl.$('.email-taken');
Meteor.call('setEmail', email.toLowerCase(), this.userId, function(
error,
) {
const emailMessageElement = templateInstance.$('.email-taken');
if (error) {
const errorElement = error.error;
if (errorElement === 'email-already-taken') {

107
client/components/settings/settingBody.js
View file

@ -25,7 +25,9 @@ BlazeComponent.extendComponent({
checkField(selector) {
const value = $(selector).val();
if (!value || value.trim() === '') {
$(selector).parents('li.smtp-form').addClass('has-error');
$(selector)
.parents('li.smtp-form')
.addClass('has-error');
throw Error('blank field');
} else {
return value;
@ -37,18 +39,23 @@ BlazeComponent.extendComponent({
},
boards() {
return Boards.find({
return Boards.find(
{
archived: false,
'members.userId': Meteor.userId(),
'members.isAdmin': true,
}, {
},
{
sort: ['title'],
});
},
);
},
toggleRegistration() {
this.setLoading(true);
const registrationClosed = this.currentSetting().disableRegistration;
Settings.update(Settings.findOne()._id, {$set: {disableRegistration: !registrationClosed}});
Settings.update(Settings.findOne()._id, {
$set: { disableRegistration: !registrationClosed },
});
this.setLoading(false);
if (registrationClosed) {
$('.invite-people').slideUp();
@ -90,13 +97,19 @@ BlazeComponent.extendComponent({
},
inviteThroughEmail() {
const emails = $('#email-to-invite').val().toLowerCase().trim().split('\n').join(',').split(',');
const emails = $('#email-to-invite')
.val()
.toLowerCase()
.trim()
.split('\n')
.join(',')
.split(',');
const boardsToInvite = [];
$('.js-toggle-board-choose .materialCheckBox.is-checked').each(function() {
boardsToInvite.push($(this).data('id'));
});
const validEmails = [];
emails.forEach((email) => {
emails.forEach(email => {
if (email && SimpleSchema.RegEx.Email.test(email.trim())) {
validEmails.push(email.trim());
}
@ -119,14 +132,22 @@ BlazeComponent.extendComponent({
try {
const host = this.checkField('#mail-server-host');
const port = this.checkField('#mail-server-port');
const username = $('#mail-server-username').val().trim();
const password = $('#mail-server-password').val().trim();
const username = $('#mail-server-username')
.val()
.trim();
const password = $('#mail-server-password')
.val()
.trim();
const from = this.checkField('#mail-server-from');
const tls = $('#mail-server-tls.is-checked').length > 0;
Settings.update(Settings.findOne()._id, {
$set: {
'mailServer.host': host, 'mailServer.port': port, 'mailServer.username': username,
'mailServer.password': password, 'mailServer.enableTLS': tls, 'mailServer.from': from,
'mailServer.host': host,
'mailServer.port': port,
'mailServer.username': username,
'mailServer.password': password,
'mailServer.enableTLS': tls,
'mailServer.from': from,
},
});
} catch (e) {
@ -134,19 +155,25 @@ BlazeComponent.extendComponent({
} finally {
this.setLoading(false);
}
},
saveLayout() {
this.setLoading(true);
$('li').removeClass('has-error');
const productName = $('#product-name').val().trim();
const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true');
const displayAuthenticationMethod = ($('input[name=displayAuthenticationMethod]:checked').val() === 'true');
const productName = $('#product-name')
.val()
.trim();
const hideLogoChange = $('input[name=hideLogo]:checked').val() === 'true';
const displayAuthenticationMethod =
$('input[name=displayAuthenticationMethod]:checked').val() === 'true';
const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
const customHTMLafterBodyStart = $('#customHTMLafterBodyStart').val().trim();
const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd').val().trim();
const customHTMLafterBodyStart = $('#customHTMLafterBodyStart')
.val()
.trim();
const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd')
.val()
.trim();
try {
Settings.update(Settings.findOne()._id, {
@ -166,7 +193,6 @@ BlazeComponent.extendComponent({
}
DocHead.setTitle(productName);
},
sendSMTPTestEmail() {
@ -183,7 +209,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click a.js-toggle-registration': this.toggleRegistration,
'click a.js-toggle-tls': this.toggleTLS,
'click a.js-setting-menu': this.switchMenu,
@ -193,21 +220,24 @@ BlazeComponent.extendComponent({
'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
'click a.js-toggle-hide-logo': this.toggleHideLogo,
'click button.js-save-layout': this.saveLayout,
'click a.js-toggle-display-authentication-method': this.toggleDisplayAuthenticationMethod,
}];
'click a.js-toggle-display-authentication-method': this
.toggleDisplayAuthenticationMethod,
},
];
},
}).register('setting');
BlazeComponent.extendComponent({
saveAccountsChange() {
const allowEmailChange = ($('input[name=allowEmailChange]:checked').val() === 'true');
const allowUserNameChange = ($('input[name=allowUserNameChange]:checked').val() === 'true');
const allowEmailChange =
$('input[name=allowEmailChange]:checked').val() === 'true';
const allowUserNameChange =
$('input[name=allowUserNameChange]:checked').val() === 'true';
AccountSettings.update('accounts-allowEmailChange', {
$set: {'booleanValue': allowEmailChange},
$set: { booleanValue: allowEmailChange },
});
AccountSettings.update('accounts-allowUserNameChange', {
$set: {'booleanValue': allowUserNameChange},
$set: { booleanValue: allowUserNameChange },
});
},
@ -219,9 +249,11 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click button.js-accounts-save': this.saveAccountsChange,
}];
},
];
},
}).register('accountSettings');
@ -239,9 +271,11 @@ BlazeComponent.extendComponent({
},
saveMessage() {
const message = $('#admin-announcement').val().trim();
const message = $('#admin-announcement')
.val()
.trim();
Announcements.update(Announcements.findOne()._id, {
$set: {'body': message},
$set: { body: message },
});
},
@ -249,7 +283,7 @@ BlazeComponent.extendComponent({
this.setLoading(true);
const isActive = this.currentSetting().enabled;
Announcements.update(Announcements.findOne()._id, {
$set: {'enabled': !isActive},
$set: { enabled: !isActive },
});
this.setLoading(false);
if (isActive) {
@ -260,14 +294,15 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click a.js-toggle-activemessage': this.toggleActive,
'click button.js-announcement-save': this.saveMessage,
}];
},
];
},
}).register('announcementSettings');
Template.selectAuthenticationMethod.onCreated(function() {
this.authenticationMethods = new ReactiveVar([]);
@ -278,7 +313,9 @@ Template.selectAuthenticationMethod.onCreated(function() {
this.authenticationMethods.set([
{ value: 'password' },
// Gets only the authentication methods availables
...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
...Object.entries(result)
.filter(e => e[1])
.map(e => ({ value: e[0] })),
]);
}
});

141
client/components/sidebar/sidebar.js
View file

@ -91,29 +91,34 @@ BlazeComponent.extendComponent({
},
showTongueTitle() {
if (this.isOpen())
return `${TAPi18n.__('sidebar-close')}`;
else
return `${TAPi18n.__('sidebar-open')}`;
if (this.isOpen()) return `${TAPi18n.__('sidebar-close')}`;
else return `${TAPi18n.__('sidebar-open')}`;
},
events() {
return [{
return [
{
'click .js-hide-sidebar': this.hide,
'click .js-toggle-sidebar': this.toggle,
'click .js-back-home': this.setView,
'click .js-shortcuts'() {
FlowRouter.go('shortcuts');
},
}];
},
];
},
}).register('sidebar');
Blaze.registerHelper('Sidebar', () => Sidebar);
EscapeActions.register('sidebarView',
() => { Sidebar.setView(defaultView); },
() => { return Sidebar && Sidebar.getView() !== defaultView; }
EscapeActions.register(
'sidebarView',
() => {
Sidebar.setView(defaultView);
},
() => {
return Sidebar && Sidebar.getView() !== defaultView;
},
);
Template.memberPopup.helpers({
@ -197,7 +202,7 @@ Template.memberPopup.events({
'click .js-remove-member': Popup.afterConfirm('removeMember', function() {
const boardId = Session.get('currentBoard');
const memberId = this.userId;
Cards.find({ boardId, members: memberId }).forEach((card) => {
Cards.find({ boardId, members: memberId }).forEach(card => {
card.unassignMember(memberId);
});
Boards.findOne(boardId).removeMember(memberId);
@ -274,8 +279,9 @@ BlazeComponent.extendComponent({
},
events() {
return [{
'submit'(evt) {
return [
{
submit(evt) {
evt.preventDefault();
const url = evt.target.url.value;
const boardId = Session.get('currentBoard');
@ -305,7 +311,8 @@ BlazeComponent.extendComponent({
}
Popup.close();
},
}];
},
];
},
}).register('outgoingWebhooksPopup');
@ -375,14 +382,16 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-select-background'(evt) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
const newColor = this.currentData().toString();
currentBoard.setColor(newColor);
evt.preventDefault();
},
}];
},
];
},
}).register('boardChangeColorPopup');
@ -400,25 +409,34 @@ BlazeComponent.extendComponent({
},
isNullBoardSelected() {
return (this.currentBoard.subtasksDefaultBoardId === null) || (this.currentBoard.subtasksDefaultBoardId === undefined);
return (
this.currentBoard.subtasksDefaultBoardId === null ||
this.currentBoard.subtasksDefaultBoardId === undefined
);
},
boards() {
return Boards.find({
return Boards.find(
{
archived: false,
'members.userId': Meteor.userId(),
}, {
},
{
sort: ['title'],
});
},
);
},
lists() {
return Lists.find({
return Lists.find(
{
boardId: this.currentBoard._id,
archived: false,
}, {
},
{
sort: ['title'],
});
},
);
},
hasLists() {
@ -431,21 +449,31 @@ BlazeComponent.extendComponent({
presentParentTask() {
let result = this.currentBoard.presentParentTask;
if ((result === null) || (result === undefined)) {
if (result === null || result === undefined) {
result = 'no-parent';
}
return result;
},
events() {
return [{
return [
{
'click .js-field-has-subtasks'(evt) {
evt.preventDefault();
this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
$('.js-field-has-subtasks .materialCheckBox').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
$('.js-field-has-subtasks').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
$('.js-field-deposit-board').prop('disabled', !this.currentBoard.allowsSubtasks);
$('.js-field-has-subtasks .materialCheckBox').toggleClass(
'is-checked',
this.currentBoard.allowsSubtasks,
);
$('.js-field-has-subtasks').toggleClass(
'is-checked',
this.currentBoard.allowsSubtasks,
);
$('.js-field-deposit-board').prop(
'disabled',
!this.currentBoard.allowsSubtasks,
);
},
'change .js-field-deposit-board'(evt) {
let value = evt.target.value;
@ -460,16 +488,25 @@ BlazeComponent.extendComponent({
evt.preventDefault();
},
'click .js-field-show-parent-in-minicard'(evt) {
const value = evt.target.id || $(evt.target).parent()[0].id || $(evt.target).parent()[0].parent()[0].id;
const value =
evt.target.id ||
$(evt.target).parent()[0].id ||
$(evt.target)
.parent()[0]
.parent()[0].id;
const options = [
'prefix-with-full-path',
'prefix-with-parent',
'subtext-with-full-path',
'subtext-with-parent',
'no-parent'];
'no-parent',
];
options.forEach(function(element) {
if (element !== value) {
$(`#${element} .materialCheckBox`).toggleClass('is-checked', false);
$(`#${element} .materialCheckBox`).toggleClass(
'is-checked',
false,
);
$(`#${element}`).toggleClass('is-checked', false);
}
});
@ -478,7 +515,8 @@ BlazeComponent.extendComponent({
this.currentBoard.setPresentParentTask(value);
evt.preventDefault();
},
}];
},
];
},
}).register('boardSubtaskSettingsPopup');
@ -528,7 +566,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'keyup input'() {
this.setError('');
},
@ -545,18 +584,28 @@ BlazeComponent.extendComponent({
this.inviteUser(idNameEmail);
} else this.setError('email-invalid');
},
}];
},
];
},
}).register('addMemberPopup');
Template.changePermissionsPopup.events({
'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only'(event) {
'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only'(
event,
) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
const memberId = this.userId;
const isAdmin = $(event.currentTarget).hasClass('js-set-admin');
const isCommentOnly = $(event.currentTarget).hasClass('js-set-comment-only');
const isCommentOnly = $(event.currentTarget).hasClass(
'js-set-comment-only',
);
const isNoComments = $(event.currentTarget).hasClass('js-set-no-comments');
currentBoard.setMemberPermission(memberId, isAdmin, isNoComments, isCommentOnly);
currentBoard.setMemberPermission(
memberId,
isAdmin,
isNoComments,
isCommentOnly,
);
Popup.back(1);
},
});
@ -569,21 +618,33 @@ Template.changePermissionsPopup.helpers({
isNormal() {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
return !currentBoard.hasAdmin(this.userId) && !currentBoard.hasNoComments(this.userId) && !currentBoard.hasCommentOnly(this.userId);
return (
!currentBoard.hasAdmin(this.userId) &&
!currentBoard.hasNoComments(this.userId) &&
!currentBoard.hasCommentOnly(this.userId)
);
},
isNoComments() {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
return !currentBoard.hasAdmin(this.userId) && currentBoard.hasNoComments(this.userId);
return (
!currentBoard.hasAdmin(this.userId) &&
currentBoard.hasNoComments(this.userId)
);
},
isCommentOnly() {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
return !currentBoard.hasAdmin(this.userId) && currentBoard.hasCommentOnly(this.userId);
return (
!currentBoard.hasAdmin(this.userId) &&
currentBoard.hasCommentOnly(this.userId)
);
},
isLastAdmin() {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
return currentBoard.hasAdmin(this.userId) && (currentBoard.activeAdmins() === 1);
return (
currentBoard.hasAdmin(this.userId) && currentBoard.activeAdmins() === 1
);
},
});

35
client/components/sidebar/sidebarArchives.js
View file

@ -10,8 +10,7 @@ BlazeComponent.extendComponent({
// unfortunatly, Blaze doesn't have this notion.
this.autorun(() => {
const currentBoardId = Session.get('currentBoard');
if (!currentBoardId)
return;
if (!currentBoardId) return;
const handle = subManager.subscribe('board', currentBoardId, true);
Tracker.nonreactive(() => {
Tracker.autorun(() => {
@ -59,7 +58,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-restore-card'() {
const card = this.currentData();
if (card.canBeRestored()) {
@ -67,7 +67,7 @@ BlazeComponent.extendComponent({
}
},
'click .js-restore-all-cards'() {
this.archivedCards().forEach((card) => {
this.archivedCards().forEach(card => {
if (card.canBeRestored()) {
card.restore();
}
@ -80,7 +80,7 @@ BlazeComponent.extendComponent({
Popup.close();
}),
'click .js-delete-all-cards': Popup.afterConfirm('cardDelete', () => {
this.archivedCards().forEach((card) => {
this.archivedCards().forEach(card => {
Cards.remove(card._id);
});
Popup.close();
@ -91,7 +91,7 @@ BlazeComponent.extendComponent({
list.restore();
},
'click .js-restore-all-lists'() {
this.archivedLists().forEach((list) => {
this.archivedLists().forEach(list => {
list.restore();
});
},
@ -101,7 +101,7 @@ BlazeComponent.extendComponent({
Popup.close();
}),
'click .js-delete-all-lists': Popup.afterConfirm('listDelete', () => {
this.archivedLists().forEach((list) => {
this.archivedLists().forEach(list => {
list.remove();
});
Popup.close();
@ -112,21 +112,28 @@ BlazeComponent.extendComponent({
swimlane.restore();
},
'click .js-restore-all-swimlanes'() {
this.archivedSwimlanes().forEach((swimlane) => {
this.archivedSwimlanes().forEach(swimlane => {
swimlane.restore();
});
},
'click .js-delete-swimlane': Popup.afterConfirm('swimlaneDelete', function() {
'click .js-delete-swimlane': Popup.afterConfirm(
'swimlaneDelete',
function() {
this.remove();
Popup.close();
}),
'click .js-delete-all-swimlanes': Popup.afterConfirm('swimlaneDelete', () => {
this.archivedSwimlanes().forEach((swimlane) => {
},
),
'click .js-delete-all-swimlanes': Popup.afterConfirm(
'swimlaneDelete',
() => {
this.archivedSwimlanes().forEach(swimlane => {
swimlane.remove();
});
Popup.close();
}),
}];
},
),
},
];
},
}).register('archivesSidebar');

63
client/components/sidebar/sidebarCustomFields.js
View file

@ -1,5 +1,4 @@
BlazeComponent.extendComponent({
customFields() {
return CustomFields.find({
boardIds: { $in: [Session.get('currentBoard')] },
@ -7,31 +6,38 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-open-create-custom-field': Popup.open('createCustomField'),
'click .js-edit-custom-field': Popup.open('editCustomField'),
}];
},
];
},
}).register('customFieldsSidebar');
const CreateCustomFieldPopup = BlazeComponent.extendComponent({
_types: ['text', 'number', 'date', 'dropdown'],
onCreated() {
this.type = new ReactiveVar((this.data().type) ? this.data().type : this._types[0]);
this.dropdownItems = new ReactiveVar((this.data().settings && this.data().settings.dropdownItems) ? this.data().settings.dropdownItems : []);
this.type = new ReactiveVar(
this.data().type ? this.data().type : this._types[0],
);
this.dropdownItems = new ReactiveVar(
this.data().settings && this.data().settings.dropdownItems
? this.data().settings.dropdownItems
: [],
);
},
types() {
const currentType = this.data().type;
return this._types.
map((type) => {return {
return this._types.map(type => {
return {
value: type,
name: TAPi18n.__(`custom-field-${type}`),
selected: type === currentType,
};});
};
});
},
isTypeNotSelected(type) {
@ -40,13 +46,16 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
getDropdownItems() {
const items = this.dropdownItems.get();
Array.from(this.findAll('.js-field-settings-dropdown input')).forEach((el, index) => {
Array.from(this.findAll('.js-field-settings-dropdown input')).forEach(
(el, index) => {
//console.log('each item!', index, el.value);
if (!items[index]) items[index] = {
if (!items[index])
items[index] = {
_id: Random.id(6),
};
items[index].name = el.value.trim();
});
},
);
return items;
},
@ -54,7 +63,9 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
const settings = {};
switch (this.type.get()) {
case 'dropdown': {
const dropdownItems = this.getDropdownItems().filter((item) => !!item.name.trim());
const dropdownItems = this.getDropdownItems().filter(
item => !!item.name.trim(),
);
settings.dropdownItems = dropdownItems;
break;
}
@ -63,7 +74,8 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'change .js-field-type'(evt) {
const value = evt.target.value;
this.type.set(value);
@ -107,8 +119,10 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
type: this.type.get(),
settings: this.getSettings(),
showOnCard: this.find('.js-field-show-on-card.is-checked') !== null,
showLabelOnMiniCard: this.find('.js-field-showLabel-on-card.is-checked') !== null,
automaticallyOnCard: this.find('.js-field-automatically-on-card.is-checked') !== null,
showLabelOnMiniCard:
this.find('.js-field-showLabel-on-card.is-checked') !== null,
automaticallyOnCard:
this.find('.js-field-automatically-on-card.is-checked') !== null,
};
// insert or update
@ -121,7 +135,9 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
Popup.back();
},
'click .js-delete-custom-field': Popup.afterConfirm('deleteCustomField', function() {
'click .js-delete-custom-field': Popup.afterConfirm(
'deleteCustomField',
function() {
const customField = CustomFields.findOne(this._id);
if (customField.boardIds.length > 1) {
CustomFields.update(customField._id, {
@ -133,20 +149,19 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
CustomFields.remove(customField._id);
}
Popup.close();
}),
}];
},
),
},
];
},
});
CreateCustomFieldPopup.register('createCustomFieldPopup');
(class extends CreateCustomFieldPopup {
template() {
return 'createCustomFieldPopup';
}
}).register('editCustomFieldPopup');
}.register('editCustomFieldPopup'));
/*Template.deleteCustomFieldPopup.events({
'submit'(evt) {

38
client/components/sidebar/sidebarFilters.js
View file

@ -1,6 +1,7 @@
BlazeComponent.extendComponent({
events() {
return [{
return [
{
'click .js-toggle-label-filter'(evt) {
evt.preventDefault();
Filter.labelIds.toggle(this.currentData()._id);
@ -18,7 +19,9 @@ BlazeComponent.extendComponent({
},
'change .js-field-advanced-filter'(evt) {
evt.preventDefault();
Filter.advanced.set(this.find('.js-field-advanced-filter').value.trim());
Filter.advanced.set(
this.find('.js-field-advanced-filter').value.trim(),
);
Filter.resetExceptions();
},
'click .js-clear-all'(evt) {
@ -27,52 +30,50 @@ BlazeComponent.extendComponent({
},
'click .js-filter-to-selection'(evt) {
evt.preventDefault();
const selectedCards = Cards.find(Filter.mongoSelector()).map((c) => {
const selectedCards = Cards.find(Filter.mongoSelector()).map(c => {
return c._id;
});
MultiSelection.add(selectedCards);
},
}];
},
];
},
}).register('filterSidebar');
function mutateSelectedCards(mutationName, ...args) {
Cards.find(MultiSelection.getMongoSelector()).forEach((card) => {
Cards.find(MultiSelection.getMongoSelector()).forEach(card => {
card[mutationName](...args);
});
}
BlazeComponent.extendComponent({
mapSelection(kind, _id) {
return Cards.find(MultiSelection.getMongoSelector()).map((card) => {
return Cards.find(MultiSelection.getMongoSelector()).map(card => {
const methodName = kind === 'label' ? 'hasLabel' : 'isAssigned';
return card[methodName](_id);
});
},
allSelectedElementHave(kind, _id) {
if (MultiSelection.isEmpty())
return false;
else
return _.every(this.mapSelection(kind, _id));
if (MultiSelection.isEmpty()) return false;
else return _.every(this.mapSelection(kind, _id));
},
someSelectedElementHave(kind, _id) {
if (MultiSelection.isEmpty())
return false;
else
return _.some(this.mapSelection(kind, _id));
if (MultiSelection.isEmpty()) return false;
else return _.some(this.mapSelection(kind, _id));
},
events() {
return [{
return [
{
'click .js-toggle-label-multiselection'(evt) {
const labelId = this.currentData()._id;
const mappedSelection = this.mapSelection('label', labelId);
if (_.every(mappedSelection)) {
mutateSelectedCards('removeLabel', labelId);
} else if (_.every(mappedSelection, (bool) => !bool)) {
} else if (_.every(mappedSelection, bool => !bool)) {
mutateSelectedCards('addLabel', labelId);
} else {
const popup = Popup.open('disambiguateMultiLabel');
@ -86,7 +87,7 @@ BlazeComponent.extendComponent({
const mappedSelection = this.mapSelection('member', memberId);
if (_.every(mappedSelection)) {
mutateSelectedCards('unassignMember', memberId);
} else if (_.every(mappedSelection, (bool) => !bool)) {
} else if (_.every(mappedSelection, bool => !bool)) {
mutateSelectedCards('assignMember', memberId);
} else {
const popup = Popup.open('disambiguateMultiMember');
@ -100,7 +101,8 @@ BlazeComponent.extendComponent({
mutateSelectedCards('archive');
EscapeActions.executeUpTo('multiselection');
},
}];
},
];
},
}).register('multiselectionSidebar');

6
client/components/sidebar/sidebarSearches.js
View file

@ -9,11 +9,13 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'submit .js-search-term-form'(evt) {
evt.preventDefault();
this.term.set(evt.target.searchTerm.value);
},
}];
},
];
},
}).register('searchSidebar');

46
client/components/swimlanes/swimlaneHeader.js
View file

@ -6,9 +6,11 @@ Meteor.startup(() => {
});
BlazeComponent.extendComponent({
editTitle(evt) {
evt.preventDefault();
const newTitle = this.childComponents('inlinedForm')[0].getValue().trim();
editTitle(event) {
event.preventDefault();
const newTitle = this.childComponents('inlinedForm')[0]
.getValue()
.trim();
const swimlane = this.currentData();
if (newTitle) {
swimlane.rename(newTitle.trim());
@ -16,18 +18,20 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-open-swimlane-menu': Popup.open('swimlaneAction'),
'click .js-open-add-swimlane-menu': Popup.open('swimlaneAdd'),
submit: this.editTitle,
}];
},
];
},
}).register('swimlaneHeader');
Template.swimlaneActionPopup.events({
'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
'click .js-close-swimlane' (evt) {
evt.preventDefault();
'click .js-close-swimlane'(event) {
event.preventDefault();
this.archive();
Popup.close();
},
@ -39,15 +43,22 @@ BlazeComponent.extendComponent({
},
events() {
return [{
submit(evt) {
evt.preventDefault();
return [
{
submit(event) {
event.preventDefault();
const currentBoard = Boards.findOne(Session.get('currentBoard'));
const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
const titleInput = this.find('.swimlane-name-input');
const title = titleInput.value.trim();
const sortValue = calculateIndexData(this.currentSwimlane, nextSwimlane, 1);
const swimlaneType = (currentBoard.isTemplatesBoard())?'template-swimlane':'swimlane';
const sortValue = calculateIndexData(
this.currentSwimlane,
nextSwimlane,
1,
);
const swimlaneType = currentBoard.isTemplatesBoard()
? 'template-swimlane'
: 'swimlane';
if (title) {
Swimlanes.insert({
@ -66,7 +77,8 @@ BlazeComponent.extendComponent({
Popup.close();
},
'click .js-swimlane-template': Popup.open('searchElement'),
}];
},
];
},
}).register('swimlaneAddPopup');
@ -77,7 +89,7 @@ BlazeComponent.extendComponent({
},
colors() {
return swimlaneColors.map((color) => ({ color, name: '' }));
return swimlaneColors.map(color => ({ color, name: '' }));
},
isSelected(color) {
@ -85,7 +97,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-palette-color'() {
this.currentColor.set(this.currentData().color);
},
@ -97,6 +110,7 @@ BlazeComponent.extendComponent({
this.currentSwimlane.setColor(null);
Popup.close();
},
}];
},
];
},
}).register('setSwimlaneColorPopup');

79
client/components/swimlanes/swimlanes.js
View file

@ -2,16 +2,27 @@ const { calculateIndex, enableClickOnTouch } = Utils;
function currentListIsInThisSwimlane(swimlaneId) {
const currentList = Lists.findOne(Session.get('currentList'));
return currentList && (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '');
return (
currentList &&
(currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '')
);
}
function currentCardIsInThisList(listId, swimlaneId) {
const currentCard = Cards.findOne(Session.get('currentCard'));
const currentUser = Meteor.user();
if (currentUser && currentUser.profile && currentUser.profile.boardView === 'board-view-swimlanes')
return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
else // Default view: board-view-lists
return currentCard && currentCard.listId === listId;
if (
currentUser &&
currentUser.profile &&
currentUser.profile.boardView === 'board-view-swimlanes'
)
return (
currentCard &&
currentCard.listId === listId &&
currentCard.swimlaneId === swimlaneId
);
// Default view: board-view-lists
else return currentCard && currentCard.listId === listId;
// https://github.com/wekan/wekan/issues/1623
// https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de
// TODO: In public board, if you would like to switch between List/Swimlane view, you could
@ -79,7 +90,11 @@ function initSortable(boardComponent, $listsDom) {
enableClickOnTouch('.js-list:not(.js-list-composer)');
function userIsMember() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
}
// Disable drag-dropping while in multi-selection mode, or if the current user
@ -87,8 +102,11 @@ function initSortable(boardComponent, $listsDom) {
boardComponent.autorun(() => {
const $listDom = $listsDom;
if ($listDom.data('sortable')) {
$listsDom.sortable('option', 'disabled',
MultiSelection.isActive() || !userIsMember());
$listsDom.sortable(
'option',
'disabled',
MultiSelection.isActive() || !userIsMember(),
);
}
});
}
@ -124,7 +142,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
// Click-and-drag action
'mousedown .board-canvas'(evt) {
// Translating the board canvas using the click-and-drag action can
@ -132,18 +151,27 @@ BlazeComponent.extendComponent({
// define a list of elements in which we disable the dragging because
// the user will legitimately expect to be able to select some text with
// his mouse.
const noDragInside = ['a', 'input', 'textarea', 'p', '.js-list-header'];
if ($(evt.target).closest(noDragInside.join(',')).length === 0 && this.$('.swimlane').prop('clientHeight') > evt.offsetY) {
const noDragInside = [
'a',
'input',
'textarea',
'p',
'.js-list-header',
];
if (
$(evt.target).closest(noDragInside.join(',')).length === 0 &&
this.$('.swimlane').prop('clientHeight') > evt.offsetY
) {
this._isDragging = true;
this._lastDragPositionX = evt.clientX;
}
},
'mouseup'() {
mouseup() {
if (this._isDragging) {
this._isDragging = false;
}
},
'mousemove'(evt) {
mousemove(evt) {
if (this._isDragging) {
// Update the canvas position
this.listsDom.scrollLeft -= evt.clientX - this._lastDragPositionX;
@ -157,14 +185,17 @@ BlazeComponent.extendComponent({
EscapeActions.preventNextClick();
}
},
}];
},
];
},
}).register('swimlane');
BlazeComponent.extendComponent({
onCreated() {
this.currentBoard = Boards.findOne(Session.get('currentBoard'));
this.isListTemplatesSwimlane = this.currentBoard.isTemplatesBoard() && this.currentData().isListTemplatesSwimlane();
this.isListTemplatesSwimlane =
this.currentBoard.isTemplatesBoard() &&
this.currentData().isListTemplatesSwimlane();
this.currentSwimlane = this.currentData();
},
@ -174,7 +205,8 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
submit(evt) {
evt.preventDefault();
const titleInput = this.find('.list-name-input');
@ -184,8 +216,10 @@ BlazeComponent.extendComponent({
title,
boardId: Session.get('currentBoard'),
sort: $('.list').length,
type: (this.isListTemplatesSwimlane)?'template-list':'list',
swimlaneId: (this.currentBoard.isTemplatesBoard())?this.currentSwimlane._id:'',
type: this.isListTemplatesSwimlane ? 'template-list' : 'list',
swimlaneId: this.currentBoard.isTemplatesBoard()
? this.currentSwimlane._id
: '',
});
titleInput.value = '';
@ -193,13 +227,18 @@ BlazeComponent.extendComponent({
}
},
'click .js-list-template': Popup.open('searchElement'),
}];
},
];
},
}).register('addListForm');
Template.swimlane.helpers({
canSeeAddList() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
return (
Meteor.user() &&
Meteor.user().isBoardMember() &&
!Meteor.user().isCommentOnly()
);
},
});

25
client/components/users/userAvatar.js
View file

@ -22,14 +22,11 @@ Template.userAvatar.helpers({
presenceStatusClassName() {
const user = Users.findOne(this.userId);
const userPresence = presences.findOne({ userId: this.userId });
if (user && user.isInvitedTo(Session.get('currentBoard')))
return 'pending';
else if (!userPresence)
return 'disconnected';
if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
else if (!userPresence) return 'disconnected';
else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
return 'active';
else
return 'idle';
else return 'idle';
},
});
@ -45,7 +42,7 @@ Template.userAvatarInitials.helpers({
viewPortWidth() {
const user = Users.findOne(this.userId);
return (user && user.getInitials().length || 1) * 12;
return ((user && user.getInitials().length) || 1) * 12;
},
});
@ -89,14 +86,15 @@ BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-upload-avatar'() {
this.$('.js-upload-avatar-input').click();
},
'change .js-upload-avatar-input'(evt) {
'change .js-upload-avatar-input'(event) {
let file, fileUrl;
FS.Utility.eachFile(evt, (f) => {
FS.Utility.eachFile(event, f => {
try {
file = Avatars.insert(new FS.File(f));
fileUrl = file.url(this.avatarUrlOptions());
@ -128,7 +126,8 @@ BlazeComponent.extendComponent({
'click .js-delete-avatar'() {
Avatars.remove(this.currentData()._id);
},
}];
},
];
},
}).register('changeAvatarPopup');
@ -146,11 +145,11 @@ Template.cardMembersPopup.helpers({
});
Template.cardMembersPopup.events({
'click .js-select-member'(evt) {
'click .js-select-member'(event) {
const card = Cards.findOne(Session.get('currentCard'));
const memberId = this.userId;
card.toggleMember(memberId);
evt.preventDefault();
event.preventDefault();
},
});

54
client/components/users/userHeader.js
View file

@ -18,8 +18,8 @@ Template.memberMenuPopup.events({
'click .js-change-avatar': Popup.open('changeAvatar'),
'click .js-change-password': Popup.open('changePassword'),
'click .js-change-language': Popup.open('changeLanguage'),
'click .js-logout'(evt) {
evt.preventDefault();
'click .js-logout'(event) {
event.preventDefault();
AccountsTemplates.logout();
},
@ -38,12 +38,12 @@ Template.editProfilePopup.helpers({
});
Template.editProfilePopup.events({
submit(evt, tpl) {
evt.preventDefault();
const fullname = tpl.find('.js-profile-fullname').value.trim();
const username = tpl.find('.js-profile-username').value.trim();
const initials = tpl.find('.js-profile-initials').value.trim();
const email = tpl.find('.js-profile-email').value.trim();
submit(event, templateInstance) {
event.preventDefault();
const fullname = templateInstance.find('.js-profile-fullname').value.trim();
const username = templateInstance.find('.js-profile-username').value.trim();
const initials = templateInstance.find('.js-profile-initials').value.trim();
const email = templateInstance.find('.js-profile-email').value.trim();
let isChangeUserName = false;
let isChangeEmail = false;
Users.update(Meteor.userId(), {
@ -53,11 +53,17 @@ Template.editProfilePopup.events({
},
});
isChangeUserName = username !== Meteor.user().username;
isChangeEmail = email.toLowerCase() !== Meteor.user().emails[0].address.toLowerCase();
isChangeEmail =
email.toLowerCase() !== Meteor.user().emails[0].address.toLowerCase();
if (isChangeUserName && isChangeEmail) {
Meteor.call('setUsernameAndEmail', username, email.toLowerCase(), Meteor.userId(), function (error) {
const usernameMessageElement = tpl.$('.username-taken');
const emailMessageElement = tpl.$('.email-taken');
Meteor.call(
'setUsernameAndEmail',
username,
email.toLowerCase(),
Meteor.userId(),
function(error) {
const usernameMessageElement = templateInstance.$('.username-taken');
const emailMessageElement = templateInstance.$('.email-taken');
if (error) {
const errorElement = error.error;
if (errorElement === 'username-already-taken') {
@ -72,10 +78,11 @@ Template.editProfilePopup.events({
emailMessageElement.hide();
Popup.back();
}
});
},
);
} else if (isChangeUserName) {
Meteor.call('setUsername', username, Meteor.userId(), function(error) {
const messageElement = tpl.$('.username-taken');
const messageElement = templateInstance.$('.username-taken');
if (error) {
messageElement.show();
} else {
@ -84,8 +91,10 @@ Template.editProfilePopup.events({
}
});
} else if (isChangeEmail) {
Meteor.call('setEmail', email.toLowerCase(), Meteor.userId(), function (error) {
const messageElement = tpl.$('.email-taken');
Meteor.call('setEmail', email.toLowerCase(), Meteor.userId(), function(
error,
) {
const messageElement = templateInstance.$('.email-taken');
if (error) {
messageElement.show();
} else {
@ -138,13 +147,13 @@ Template.changeLanguagePopup.helpers({
});
Template.changeLanguagePopup.events({
'click .js-set-language'(evt) {
'click .js-set-language'(event) {
Users.update(Meteor.userId(), {
$set: {
'profile.language': this.tag,
},
});
evt.preventDefault();
event.preventDefault();
},
});
@ -161,9 +170,12 @@ Template.changeSettingsPopup.events({
'click .js-toggle-system-messages'() {
Meteor.call('toggleSystemMessages');
},
'click .js-apply-show-cards-at'(evt, tpl) {
evt.preventDefault();
const minLimit = parseInt(tpl.$('#show-cards-count-at').val(), 10);
'click .js-apply-show-cards-at'(event, templateInstance) {
event.preventDefault();
const minLimit = parseInt(
templateInstance.$('#show-cards-count-at').val(),
10,
);
if (!isNaN(minLimit)) {
Meteor.call('changeLimitToShowCardsCount', minLimit);
Popup.back();

2
client/config/blazeHelpers.js
View file

@ -25,7 +25,7 @@ Blaze.registerHelper('currentList', () => {
}
});
Blaze.registerHelper('getUser', (userId) => Users.findOne(userId));
Blaze.registerHelper('getUser', userId => Users.findOne(userId));
Blaze.registerHelper('concat', (...args) => args.slice(0, -1).join(''));

5
client/lib/accessibility.js
View file

@ -27,10 +27,7 @@ function copyTitleInAriaLabel(attributes) {
// which is a little bit hacky -- but still reasonable with our ES6 usage. If we
// end up switching to React we will probably create lower level small
// components to handle that without overwriting any build-in function.
const {
A: superA,
I: superI,
} = HTML;
const { A: superA, I: superI } = HTML;
HTML.A = (attributes, ...others) => {
return superA(copyTitleInAriaLabel(enforceHref(attributes)), ...others);

30
client/lib/datepicker.js
View file

@ -10,15 +10,20 @@ DatePicker = BlazeComponent.extendComponent({
},
onRendered() {
const $picker = this.$('.js-datepicker').datepicker({
const $picker = this.$('.js-datepicker')
.datepicker({
todayHighlight: true,
todayBtn: 'linked',
language: TAPi18n.getLanguage(),
}).on('changeDate', function(evt) {
})
.on(
'changeDate',
function(evt) {
this.find('#date').value = moment(evt.date).format('L');
this.error.set('');
this.find('#time').focus();
}.bind(this));
}.bind(this),
);
if (this.date.get().isValid()) {
$picker.datepicker('update', this.date.get().toDate());
@ -26,13 +31,11 @@ DatePicker = BlazeComponent.extendComponent({
},
showDate() {
if (this.date.get().isValid())
return this.date.get().format('L');
if (this.date.get().isValid()) return this.date.get().format('L');
return '';
},
showTime() {
if (this.date.get().isValid())
return this.date.get().format('LT');
if (this.date.get().isValid()) return this.date.get().format('LT');
return '';
},
dateFormat() {
@ -43,7 +46,8 @@ DatePicker = BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'keyup .js-date-field'() {
// parse for localized date format in strict mode
const dateMoment = moment(this.find('#date').value, 'L', true);
@ -63,15 +67,16 @@ DatePicker = BlazeComponent.extendComponent({
evt.preventDefault();
// if no time was given, init with 12:00
const time = evt.target.time.value || moment(new Date().setHours(12, 0, 0)).format('LT');
const time =
evt.target.time.value ||
moment(new Date().setHours(12, 0, 0)).format('LT');
const dateString = `${evt.target.date.value} ${time}`;
const newDate = moment(dateString, 'L LT', true);
if (newDate.isValid()) {
this._storeDate(newDate.toDate());
Popup.close();
}
else {
} else {
this.error.set('invalid-date');
evt.target.date.focus();
}
@ -81,6 +86,7 @@ DatePicker = BlazeComponent.extendComponent({
this._deleteDate();
Popup.close();
},
}];
},
];
},
});

9
client/lib/dropImage.js
View file

@ -11,7 +11,10 @@
$.event.fix = (function(originalFix) {
return function(event) {
event = originalFix.apply(this, arguments);
if (event.type.indexOf('drag') === 0 || event.type.indexOf('drop') === 0) {
if (
event.type.indexOf('drag') === 0 ||
event.type.indexOf('drop') === 0
) {
event.dataTransfer = event.originalEvent.dataTransfer;
}
return event;
@ -23,7 +26,7 @@
matchType: /image.*/,
};
return $.fn.dropImageReader = function(options) {
return ($.fn.dropImageReader = function(options) {
if (typeof options === 'function') {
options = {
callback: options,
@ -58,5 +61,5 @@
}
});
});
};
});
})(jQuery);

38
client/lib/escapeActions.js
View file

@ -33,13 +33,19 @@ EscapeActions = {
const noClickEscapeOn = options.noClickEscapeOn;
this._actions = _.sortBy([...this._actions, {
this._actions = _.sortBy(
[
...this._actions,
{
priority,
condition,
action,
noClickEscapeOn,
enabledOnClick,
}], (action) => action.priority);
},
],
action => action.priority,
);
},
executeLowest() {
@ -80,10 +86,8 @@ EscapeActions = {
},
_stopClick(action, clickTarget) {
if (!_.isString(action.noClickEscapeOn))
return false;
else
return $(clickTarget).closest(action.noClickEscapeOn).length > 0;
if (!_.isString(action.noClickEscapeOn)) return false;
else return $(clickTarget).closest(action.noClickEscapeOn).length > 0;
},
_execute(options) {
@ -95,14 +99,11 @@ EscapeActions = {
let executedAtLeastOne = false;
let maxPriority;
if (!maxLabel)
maxPriority = Infinity;
else
maxPriority = this.hierarchy.indexOf(maxLabel);
if (!maxLabel) maxPriority = Infinity;
else maxPriority = this.hierarchy.indexOf(maxLabel);
for (const currentAction of this._actions) {
if (currentAction.priority > maxPriority)
return executedAtLeastOne;
if (currentAction.priority > maxPriority) return executedAtLeastOne;
if (isClick && this._stopClick(currentAction, clickTarget))
return executedAtLeastOne;
@ -111,8 +112,7 @@ EscapeActions = {
if (isEnabled && currentAction.condition()) {
currentAction.action();
executedAtLeastOne = true;
if (!multipleActions)
return executedAtLeastOne;
if (!multipleActions) return executedAtLeastOne;
}
}
return executedAtLeastOne;
@ -128,13 +128,15 @@ Mousetrap.bindGlobal('esc', () => {
// On a left click on the document, we try to exectute one escape action (eg,
// close the popup). We don't execute any action if the user has clicked on a
// link or a button.
$(document).on('click', (evt) => {
if (evt.button === 0 &&
$(evt.target).closest('a,button,.is-editable').length === 0) {
$(document).on('click', evt => {
if (
evt.button === 0 &&
$(evt.target).closest('a,button,.is-editable').length === 0
) {
EscapeActions.clickExecute(evt.target, 'multiselection');
}
});
$(document).on('click', 'a[href=\\#]', (evt) => {
$(document).on('click', 'a[href=\\#]', evt => {
evt.preventDefault();
});

114
client/lib/filter.js
View file

@ -71,18 +71,19 @@ class SetFilter {
_getEmptySelector() {
this._dep.depend();
let includeEmpty = false;
this._selectedElements.forEach((el) => {
this._selectedElements.forEach(el => {
if (el === undefined) {
includeEmpty = true;
}
});
return includeEmpty ? {
return includeEmpty
? {
$eq: [],
} : null;
}
: null;
}
}
// Advanced filter forms a MongoSelector from a users String.
// Build by: Ignatz 19.05.2018 (github feuerball11)
class AdvancedFilter {
@ -128,7 +129,8 @@ class AdvancedFilter {
current += char;
continue;
}
if (char === '\'') {
// eslint-disable-next-line quotes
if (char === "'") {
string = !string;
if (string) wasString = true;
continue;
@ -139,8 +141,8 @@ class AdvancedFilter {
}
if (char === ' ' && !string) {
commands.push({
'cmd': current,
'string': wasString,
cmd: current,
string: wasString,
regex,
});
wasString = false;
@ -151,8 +153,8 @@ class AdvancedFilter {
}
if (current !== '') {
commands.push({
'cmd': current,
'string': wasString,
cmd: current,
string: wasString,
regex,
});
}
@ -161,16 +163,19 @@ class AdvancedFilter {
_fieldNameToId(field) {
const found = CustomFields.findOne({
'name': field,
name: field,
});
return found._id;
}
_fieldValueToId(field, value) {
const found = CustomFields.findOne({
'name': field,
name: field,
});
if (found.settings.dropdownItems && found.settings.dropdownItems.length > 0) {
if (
found.settings.dropdownItems &&
found.settings.dropdownItems.length > 0
) {
for (let i = 0; i < found.settings.dropdownItems.length; i++) {
if (found.settings.dropdownItems[i].name === value) {
return found.settings.dropdownItems[i]._id;
@ -202,21 +207,18 @@ class AdvancedFilter {
for (let i = 0; i < commands.length; i++) {
if (commands[i].cmd) {
switch (commands[i].cmd) {
case '(':
{
case '(': {
level++;
if (start === -1) start = i;
continue;
}
case ')':
{
case ')': {
level--;
commands.splice(i, 1);
i--;
continue;
}
default:
{
default: {
if (level > 0) {
subcommands.push(commands[i]);
commands.splice(i, 1);
@ -229,10 +231,8 @@ class AdvancedFilter {
}
if (start !== -1) {
this._processSubCommands(subcommands);
if (subcommands.length === 1)
commands.splice(start, 0, subcommands[0]);
else
commands.splice(start, 0, subcommands);
if (subcommands.length === 1) commands.splice(start, 0, subcommands[0]);
else commands.splice(start, 0, subcommands);
}
this._processConditions(commands);
this._processLogicalOperators(commands);
@ -244,17 +244,14 @@ class AdvancedFilter {
switch (commands[i].cmd) {
case '=':
case '==':
case '===':
{
case '===': {
const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd;
if (commands[i + 1].regex) {
const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
let regex = null;
if (match.length > 2)
regex = new RegExp(match[1], match[2]);
else
regex = new RegExp(match[1]);
if (match.length > 2) regex = new RegExp(match[1], match[2]);
else regex = new RegExp(match[1]);
commands[i] = {
'customFields._id': this._fieldNameToId(field),
'customFields.value': regex,
@ -274,17 +271,14 @@ class AdvancedFilter {
break;
}
case '!=':
case '!==':
{
case '!==': {
const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd;
if (commands[i + 1].regex) {
const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
let regex = null;
if (match.length > 2)
regex = new RegExp(match[1], match[2]);
else
regex = new RegExp(match[1]);
if (match.length > 2) regex = new RegExp(match[1], match[2]);
else regex = new RegExp(match[1]);
commands[i] = {
'customFields._id': this._fieldNameToId(field),
'customFields.value': {
@ -310,8 +304,7 @@ class AdvancedFilter {
case '>':
case 'gt':
case 'Gt':
case 'GT':
{
case 'GT': {
const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd;
commands[i] = {
@ -330,8 +323,7 @@ class AdvancedFilter {
case '>==':
case 'gte':
case 'Gte':
case 'GTE':
{
case 'GTE': {
const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd;
commands[i] = {
@ -349,8 +341,7 @@ class AdvancedFilter {
case '<':
case 'lt':
case 'Lt':
case 'LT':
{
case 'LT': {
const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd;
commands[i] = {
@ -369,8 +360,7 @@ class AdvancedFilter {
case '<==':
case 'lte':
case 'Lte':
case 'LTE':
{
case 'LTE': {
const field = commands[i - 1].cmd;
const str = commands[i + 1].cmd;
commands[i] = {
@ -398,8 +388,7 @@ class AdvancedFilter {
case 'Or':
case 'OR':
case '|':
case '||':
{
case '||': {
const op1 = commands[i - 1];
const op2 = commands[i + 1];
commands[i] = {
@ -415,8 +404,7 @@ class AdvancedFilter {
case 'And':
case 'AND':
case '&':
case '&&':
{
case '&&': {
const op1 = commands[i - 1];
const op2 = commands[i + 1];
commands[i] = {
@ -431,8 +419,7 @@ class AdvancedFilter {
case 'not':
case 'Not':
case 'NOT':
case '!':
{
case '!': {
const op1 = commands[i + 1];
commands[i] = {
$not: op1,
@ -452,7 +439,6 @@ class AdvancedFilter {
const commands = this._filterToCommands();
return this._arrayToSelector(commands);
}
}
// The global Filter object.
@ -477,23 +463,26 @@ Filter = {
_exceptionsDep: new Tracker.Dependency(),
isActive() {
return _.any(this._fields, (fieldName) => {
return (
_.any(this._fields, fieldName => {
return this[fieldName]._isActive();
}) || this.advanced._isActive();
}) || this.advanced._isActive()
);
},
_getMongoSelector() {
if (!this.isActive())
return {};
if (!this.isActive()) return {};
const filterSelector = {};
const emptySelector = {};
let includeEmptySelectors = false;
this._fields.forEach((fieldName) => {
this._fields.forEach(fieldName => {
const filter = this[fieldName];
if (filter._isActive()) {
if (filter.subField !== '') {
filterSelector[`${fieldName}.${filter.subField}`] = filter._getMongoSelector();
filterSelector[
`${fieldName}.${filter.subField}`
] = filter._getMongoSelector();
} else {
filterSelector[fieldName] = filter._getMongoSelector();
}
@ -513,11 +502,15 @@ Filter = {
const selectors = [exceptionsSelector];
if (_.any(this._fields, (fieldName) => {
if (
_.any(this._fields, fieldName => {
return this[fieldName]._isActive();
})) selectors.push(filterSelector);
})
)
selectors.push(filterSelector);
if (includeEmptySelectors) selectors.push(emptySelector);
if (this.advanced._isActive()) selectors.push(this.advanced._getMongoSelector());
if (this.advanced._isActive())
selectors.push(this.advanced._getMongoSelector());
return {
$or: selectors,
@ -526,8 +519,7 @@ Filter = {
mongoSelector(additionalSelector) {
const filterSelector = this._getMongoSelector();
if (_.isUndefined(additionalSelector))
return filterSelector;
if (_.isUndefined(additionalSelector)) return filterSelector;
else
return {
$and: [filterSelector, additionalSelector],
@ -535,7 +527,7 @@ Filter = {
},
reset() {
this._fields.forEach((fieldName) => {
this._fields.forEach(fieldName => {
const filter = this[fieldName];
filter.reset();
});

20
client/lib/inlinedform.js
View file

@ -48,7 +48,8 @@ InlinedForm = BlazeComponent.extendComponent({
},
events() {
return [{
return [
{
'click .js-close-inlined-form': this.close,
'click .js-open-inlined-form': this.open,
@ -67,16 +68,23 @@ InlinedForm = BlazeComponent.extendComponent({
});
}
},
}];
},
];
},
}).register('inlinedForm');
// Press escape to close the currently opened inlinedForm
EscapeActions.register('inlinedForm',
() => { currentlyOpenedForm.get().close(); },
() => { return currentlyOpenedForm.get() !== null; }, {
EscapeActions.register(
'inlinedForm',
() => {
currentlyOpenedForm.get().close();
},
() => {
return currentlyOpenedForm.get() !== null;
},
{
enabledOnClick: false,
}
},
);
// submit on click outside

35
client/lib/keyboard.js
View file

@ -40,8 +40,10 @@ Mousetrap.bind(['down', 'up'], (evt, key) => {
return;
}
const nextFunc = (key === 'down' ? 'next' : 'prev');
const nextCard = $('.js-minicard.is-selected')[nextFunc]('.js-minicard').get(0);
const nextFunc = key === 'down' ? 'next' : 'prev';
const nextCard = $('.js-minicard.is-selected')
[nextFunc]('.js-minicard')
.get(0);
if (nextCard) {
const nextCardId = Blaze.getData(nextCard)._id;
Utils.goCardId(nextCardId);
@ -49,7 +51,7 @@ Mousetrap.bind(['down', 'up'], (evt, key) => {
});
// XXX This shortcut should also work when hovering over a card in board view
Mousetrap.bind('space', (evt) => {
Mousetrap.bind('space', evt => {
if (!Session.get('currentCard')) {
return;
}
@ -69,29 +71,38 @@ Mousetrap.bind('space', (evt) => {
});
Template.keyboardShortcuts.helpers({
mapping: [{
mapping: [
{
keys: ['W'],
action: 'shortcut-toggle-sidebar',
}, {
},
{
keys: ['Q'],
action: 'shortcut-filter-my-cards',
}, {
},
{
keys: ['F'],
action: 'shortcut-toggle-filterbar',
}, {
},
{
keys: ['X'],
action: 'shortcut-clear-filters',
}, {
},
{
keys: ['?'],
action: 'shortcut-show-shortcuts',
}, {
},
{
keys: ['ESC'],
action: 'shortcut-close-dialog',
}, {
},
{
keys: ['@'],
action: 'shortcut-autocomplete-members',
}, {
},
{
keys: ['SPACE'],
action: 'shortcut-assign-self',
}],
},
],
});

10
client/lib/modal.js
View file

@ -1,6 +1,6 @@
const closedValue = null;
window.Modal = new class {
window.Modal = new (class {
constructor() {
this._currentModal = new ReactiveVar(closedValue);
this._onCloseGoTo = '';
@ -41,14 +41,14 @@ window.Modal = new class {
open(modalName, { header = '', onCloseGoTo = '' } = {}) {
this._currentModal.set({ header, modalName });
this._onCloseGoTo = onCloseGoTo;
}
}();
})();
Blaze.registerHelper('Modal', Modal);
EscapeActions.register('modalWindow',
EscapeActions.register(
'modalWindow',
() => Modal.close(),
() => Modal.isOpen(),
{ noClickEscapeOn: '.modal-container' }
{ noClickEscapeOn: '.modal-container' },
);

36
client/lib/multiSelection.js
View file

@ -1,6 +1,4 @@
function getCardsBetween(idA, idB) {
function pluckId(doc) {
return doc._id;
}
@ -15,7 +13,7 @@ function getCardsBetween(idA, idB) {
}).map(pluckId);
}
const cards = _.sortBy([Cards.findOne(idA), Cards.findOne(idB)], (c) => {
const cards = _.sortBy([Cards.findOne(idA), Cards.findOne(idB)], c => {
return c.sort;
});
@ -31,17 +29,21 @@ function getCardsBetween(idA, idB) {
};
} else {
selector = {
$or: [{
$or: [
{
listId: cards[0].listId,
sort: { $lte: cards[0].sort },
}, {
},
{
listId: {
$in: getListsStrictlyBetween(cards[0].listId, cards[1].listId),
},
}, {
},
{
listId: cards[1].listId,
sort: { $gte: cards[1].sort },
}],
},
],
archived: false,
};
}
@ -133,14 +135,12 @@ MultiSelection = {
const selectedCards = this._selectedCards.get();
cardIds.forEach((cardId) => {
cardIds.forEach(cardId => {
const indexOfCard = selectedCards.indexOf(cardId);
if (options.remove && indexOfCard > -1)
selectedCards.splice(indexOfCard, 1);
else if (options.add)
selectedCards.push(cardId);
else if (options.add) selectedCards.push(cardId);
});
this._selectedCards.set(selectedCards);
@ -153,9 +153,15 @@ MultiSelection = {
Blaze.registerHelper('MultiSelection', MultiSelection);
EscapeActions.register('multiselection',
() => { MultiSelection.disable(); },
() => { return MultiSelection.isActive(); }, {
EscapeActions.register(
'multiselection',
() => {
MultiSelection.disable();
},
() => {
return MultiSelection.isActive();
},
{
noClickEscapeOn: '.js-minicard,.js-board-sidebar-content',
}
},
);

14
client/lib/pasteImage.js
View file

@ -11,7 +11,10 @@
$.event.fix = (function(originalFix) {
return function(event) {
event = originalFix.apply(this, arguments);
if (event.type.indexOf('copy') === 0 || event.type.indexOf('paste') === 0) {
if (
event.type.indexOf('copy') === 0 ||
event.type.indexOf('paste') === 0
) {
event.clipboardData = event.originalEvent.clipboardData;
}
return event;
@ -23,7 +26,7 @@
matchType: /image.*/,
};
return $.fn.pasteImageReader = function(options) {
return ($.fn.pasteImageReader = function(options) {
if (typeof options === 'function') {
options = {
callback: options,
@ -36,7 +39,10 @@
const types = event.clipboardData.types;
const items = event.clipboardData.items;
for (let i = 0; i < types.length; i++) {
if(types[i].match(options.matchType) || items[i].type.match(options.matchType)) {
if (
types[i].match(options.matchType) ||
items[i].type.match(options.matchType)
) {
const f = items[i].getAsFile();
const reader = new FileReader();
reader.onload = function(evt) {
@ -53,5 +59,5 @@
}
});
});
};
});
})(jQuery);

25
client/lib/popup.js
View file

@ -1,4 +1,4 @@
window.Popup = new class {
window.Popup = new (class {
constructor() {
// The template we use to render popups
this.template = Template.popup;
@ -67,7 +67,7 @@ window.Popup = new class {
title: self._getTitle(popupName),
depth: self._stack.length,
offset: self._getOffset(openerElement),
dataContext: this.currentData && this.currentData() || this,
dataContext: (this.currentData && this.currentData()) || this,
});
// If there are no popup currently opened we use the Blaze API to render
@ -80,11 +80,14 @@ window.Popup = new class {
// our internal dependency, and since we just changed the top element of
// our internal stack, the popup will be updated with the new data.
if (!self.isOpen()) {
self.current = Blaze.renderWithData(self.template, () => {
self.current = Blaze.renderWithData(
self.template,
() => {
self._dep.depend();
return { ...self._getTopStack(), stack: self._stack };
}, document.body);
},
document.body,
);
} else {
self._dep.changed();
}
@ -101,7 +104,7 @@ window.Popup = new class {
const self = this;
return function(evt, tpl) {
const context = this.currentData && this.currentData() || this;
const context = (this.currentData && this.currentData()) || this;
context.__afterConfirmAction = action;
self.open(name).call(context, evt, tpl);
};
@ -136,7 +139,6 @@ window.Popup = new class {
const openerElement = this._getTopStack().openerElement;
$(openerElement).removeClass('is-active');
this._stack = [];
}
}
@ -188,18 +190,19 @@ window.Popup = new class {
return title !== translationKey ? title : defaultTitle;
};
}
}();
})();
// We close a potential opened popup on any left click on the document, or go
// one step back by pressing escape.
const escapeActions = ['back', 'close'];
escapeActions.forEach((actionName) => {
EscapeActions.register(`popup-${actionName}`,
escapeActions.forEach(actionName => {
EscapeActions.register(
`popup-${actionName}`,
() => Popup[actionName](),
() => Popup.isOpen(),
{
noClickEscapeOn: '.js-pop-over,.js-open-card-title-popup',
enabledOnClick: actionName === 'close',
}
},
);
});

7
client/lib/textComplete.js
View file

@ -47,9 +47,6 @@ $.fn.escapeableTextComplete = function(strategies, options, ...otherArgs) {
});
};
EscapeActions.register('textcomplete',
() => {},
() => dropdownMenuIsOpened, {
EscapeActions.register('textcomplete', () => {}, () => dropdownMenuIsOpened, {
noClickEscapeOn: '.textcomplete-dropdown',
}
);
});

44
client/lib/utils.js
View file

@ -2,20 +2,26 @@ Utils = {
// XXX We should remove these two methods
goBoardId(_id) {
const board = Boards.findOne(_id);
return board && FlowRouter.go('board', {
return (
board &&
FlowRouter.go('board', {
id: board._id,
slug: board.slug,
});
})
);
},
goCardId(_id) {
const card = Cards.findOne(_id);
const board = Boards.findOne(card.boardId);
return board && FlowRouter.go('card', {
return (
board &&
FlowRouter.go('card', {
cardId: card._id,
boardId: board._id,
slug: board.slug,
});
})
);
},
capitalize(string) {
@ -104,13 +110,21 @@ Utils = {
return window.matchMedia(query).matches;
};
if (('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch) {
if (
'ontouchstart' in window ||
(window.DocumentTouch && document instanceof window.DocumentTouch)
) {
return true;
}
// include the 'heartz' as a way to have a non matching MQ to help terminate the join
// https://git.io/vznFH
const query = ['(', prefixes.join('touch-enabled),('), 'heartz', ')'].join('');
const query = [
'(',
prefixes.join('touch-enabled),('),
'heartz',
')',
].join('');
return mq(query);
})();
Utils.isTouchDevice = () => isTouchable;
@ -120,7 +134,7 @@ Utils = {
calculateTouchDistance(touchA, touchB) {
return Math.sqrt(
Math.pow(touchA.screenX - touchB.screenX, 2) +
Math.pow(touchA.screenY - touchB.screenY, 2)
Math.pow(touchA.screenY - touchB.screenY, 2),
);
},
@ -136,7 +150,11 @@ Utils = {
lastTouch = touches[touches.length - 1];
});
$(document).on('touchend', selector, function(e) {
if (touchStart && lastTouch && Utils.calculateTouchDistance(touchStart, lastTouch) <= 20) {
if (
touchStart &&
lastTouch &&
Utils.calculateTouchDistance(touchStart, lastTouch) <= 20
) {
e.preventDefault();
const clickEvent = document.createEvent('MouseEvents');
clickEvent.initEvent('click', true, true);
@ -223,9 +241,15 @@ Utils = {
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();
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 === '') {

32
config/accounts.js
View file

@ -1,20 +1,25 @@
const passwordField = AccountsTemplates.removeField('password');
const emailField = AccountsTemplates.removeField('email');
AccountsTemplates.addFields([{
AccountsTemplates.addFields([
{
_id: 'username',
type: 'text',
displayName: 'username',
required: true,
minLength: 2,
}, emailField, passwordField, {
},
emailField,
passwordField,
{
_id: 'invitationcode',
type: 'text',
displayName: 'Invitation Code',
required: false,
minLength: 6,
template: 'invitationCode',
}]);
},
]);
AccountsTemplates.configure({
defaultLayout: 'userFormsLayout',
@ -34,7 +39,8 @@ AccountsTemplates.configure({
});
['signIn', 'signUp', 'resetPwd', 'forgotPwd', 'enrollAccount'].forEach(
(routeName) => AccountsTemplates.configureRoute(routeName));
routeName => AccountsTemplates.configureRoute(routeName),
);
// We display the form to change the password in a popup window that already
// have a title, so we unset the title automatically displayed by useraccounts.
@ -56,15 +62,25 @@ AccountsTemplates.configureRoute('changePwd', {
});
if (Meteor.isServer) {
['resetPassword-subject', 'resetPassword-text', 'verifyEmail-subject', 'verifyEmail-text', 'enrollAccount-subject', 'enrollAccount-text'].forEach((str) => {
[
'resetPassword-subject',
'resetPassword-text',
'verifyEmail-subject',
'verifyEmail-text',
'enrollAccount-subject',
'enrollAccount-text',
].forEach(str => {
const [templateName, field] = str.split('-');
Accounts.emailTemplates[templateName][field] = (user, url) => {
return TAPi18n.__(`email-${str}`, {
return TAPi18n.__(
`email-${str}`,
{
url,
user: user.getName(),
siteName: Accounts.emailTemplates.siteName,
}, user.getLanguage());
},
user.getLanguage(),
);
};
});
}

12
config/router.js
View file

@ -1,7 +1,9 @@
let previousPath;
FlowRouter.triggers.exit([({path}) => {
FlowRouter.triggers.exit([
({ path }) => {
previousPath = path;
}]);
},
]);
FlowRouter.route('/', {
name: 'home',
@ -192,9 +194,11 @@ const redirections = {
_.each(redirections, (newPath, oldPath) => {
FlowRouter.route(oldPath, {
triggersEnter: [(context, redirect) => {
triggersEnter: [
(context, redirect) => {
redirect(FlowRouter.path(newPath, context.params));
}],
},
],
});
});

11
models/accountSettings.js
View file

@ -37,7 +37,7 @@ AccountSettings.attachSchema(
}
},
},
})
}),
);
AccountSettings.allow({
@ -47,11 +47,6 @@ AccountSettings.allow({
},
});
AccountSettings.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
if (Meteor.isServer) {
Meteor.startup(() => {
AccountSettings._collection._ensureIndex({ modifiedAt: -1 });
@ -62,7 +57,7 @@ if (Meteor.isServer) {
booleanValue: false,
sort: 0,
},
}
},
);
AccountSettings.upsert(
{ _id: 'accounts-allowUserNameChange' },
@ -71,7 +66,7 @@ if (Meteor.isServer) {
booleanValue: false,
sort: 1,
},
}
},
);
});
}

5
models/actions.js
View file

@ -20,11 +20,6 @@ Actions.helpers({
},
});
Actions.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
if (Meteor.isServer) {
Meteor.startup(() => {
Actions._collection._ensureIndex({ modifiedAt: -1 });

19
models/activities.js
View file

@ -71,11 +71,6 @@ Activities.after.insert((userId, doc) => {
RulesHelper.executeRules(activity);
});
Activities.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
if (Meteor.isServer) {
// For efficiency create indexes on the date of creation, and on the date of
// creation in conjunction with the card or board id, as corresponding views
@ -87,15 +82,15 @@ if (Meteor.isServer) {
Activities._collection._ensureIndex({ boardId: 1, createdAt: -1 });
Activities._collection._ensureIndex(
{ commentId: 1 },
{ partialFilterExpression: { commentId: { $exists: true } } }
{ partialFilterExpression: { commentId: { $exists: true } } },
);
Activities._collection._ensureIndex(
{ attachmentId: 1 },
{ partialFilterExpression: { attachmentId: { $exists: true } } }
{ partialFilterExpression: { attachmentId: { $exists: true } } },
);
Activities._collection._ensureIndex(
{ customFieldId: 1 },
{ partialFilterExpression: { customFieldId: { $exists: true } } }
{ partialFilterExpression: { customFieldId: { $exists: true } } },
);
// Label activity did not work yet, unable to edit labels when tried this.
//Activities._collection._dropIndex({ labelId: 1 }, { "indexKey": -1 });
@ -205,20 +200,20 @@ if (Meteor.isServer) {
if (board) {
const watchingUsers = _.pluck(
_.where(board.watchers, { level: 'watching' }),
'userId'
'userId',
);
const trackingUsers = _.pluck(
_.where(board.watchers, { level: 'tracking' }),
'userId'
'userId',
);
watchers = _.union(
watchers,
watchingUsers,
_.intersection(participants, trackingUsers)
_.intersection(participants, trackingUsers),
);
}
Notifications.getUsers(watchers).forEach((user) => {
Notifications.getUsers(watchers).forEach(user => {
Notifications.notify(user, title, description, params);
});

7
models/announcements.js
View file

@ -42,7 +42,7 @@ Announcements.attachSchema(
}
},
},
})
}),
);
Announcements.allow({
@ -52,11 +52,6 @@ Announcements.allow({
},
});
Announcements.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
if (Meteor.isServer) {
Meteor.startup(() => {
Announcements._collection._ensureIndex({ modifiedAt: -1 });

4
models/attachments.js
View file

@ -12,7 +12,7 @@ Attachments = new FS.Collection('attachments', {
// XXX Should we use `beforeWrite` option of CollectionFS instead of
// collection-hooks?
// We should use `beforeWrite`.
beforeWrite: (fileObj) => {
beforeWrite: fileObj => {
if (!fileObj.isImage()) {
return {
type: 'application/octet-stream',
@ -84,7 +84,7 @@ if (Meteor.isServer) {
$unset: {
source: '',
},
}
},
);
}
});

55
models/boards.js
View file

@ -101,7 +101,7 @@ Boards.attachSchema(
const colors = Boards.simpleSchema()._schema['labels.$.color']
.allowedValues;
const defaultLabelsColors = _.clone(colors).splice(0, 6);
return defaultLabelsColors.map((color) => ({
return defaultLabelsColors.map(color => ({
color,
_id: Random.id(6),
name: '',
@ -342,7 +342,7 @@ Boards.attachSchema(
type: String,
defaultValue: 'board',
},
})
}),
);
Boards.helpers({
@ -355,7 +355,7 @@ Boards.helpers({
Swimlanes.find({
boardId: oldId,
archived: false,
}).forEach((swimlane) => {
}).forEach(swimlane => {
swimlane.type = 'swimlane';
swimlane.copy(_id);
});
@ -382,7 +382,7 @@ Boards.helpers({
isActiveMember(userId) {
if (userId) {
return this.members.find(
(member) => member.userId === userId && member.isActive
member => member.userId === userId && member.isActive,
);
} else {
return false;
@ -396,14 +396,14 @@ Boards.helpers({
cards() {
return Cards.find(
{ boardId: this._id, archived: false },
{ sort: { title: 1 } }
{ sort: { title: 1 } },
);
},
lists() {
return Lists.find(
{ boardId: this._id, archived: false },
{ sort: { sort: 1 } }
{ sort: { sort: 1 } },
);
},
@ -418,7 +418,7 @@ Boards.helpers({
swimlanes() {
return Swimlanes.find(
{ boardId: this._id, archived: false },
{ sort: { sort: 1 } }
{ sort: { sort: 1 } },
);
},
@ -432,7 +432,7 @@ Boards.helpers({
},
{
sort: { sort: 1 },
}
},
);
},
@ -535,7 +535,7 @@ Boards.helpers({
customFields() {
return CustomFields.find(
{ boardIds: { $in: [this._id] } },
{ sort: { name: 1 } }
{ sort: { name: 1 } },
);
},
@ -848,7 +848,7 @@ Boards.mutations({
isAdmin,
isNoComments,
isCommentOnly,
currentUserId = Meteor.userId()
currentUserId = Meteor.userId(),
) {
const memberIndex = this.memberIndex(memberId);
// do not allow change permission of self
@ -884,9 +884,9 @@ Boards.mutations({
function boardRemover(userId, doc) {
[Cards, Lists, Swimlanes, Integrations, Rules, Activities].forEach(
(element) => {
element => {
element.remove({ boardId: doc._id });
}
},
);
}
@ -927,7 +927,7 @@ if (Meteor.isServer) {
_.findWhere(doc.members, {
userId: removedMemberId,
isAdmin: true,
})
}),
);
},
fetch: ['members'],
@ -973,7 +973,7 @@ if (Meteor.isServer) {
_id: 1,
'members.userId': 1,
},
{ unique: true }
{ unique: true },
);
Boards._collection._ensureIndex({ 'members.userId': 1 });
});
@ -1009,12 +1009,12 @@ if (Meteor.isServer) {
labelIds: removedLabelId,
},
},
{ multi: true }
{ multi: true },
);
});
const foreachRemovedMember = (doc, modifier, callback) => {
Object.keys(modifier).forEach((set) => {
Object.keys(modifier).forEach(set => {
if (modifier[set] !== false) {
return;
}
@ -1030,11 +1030,6 @@ if (Meteor.isServer) {
});
};
Boards.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
// Remove a member from all objects of the board before leaving the board
Boards.before.update((userId, doc, fieldNames, modifier) => {
if (!_.contains(fieldNames, 'members')) {
@ -1043,7 +1038,7 @@ if (Meteor.isServer) {
if (modifier.$set) {
const boardId = doc._id;
foreachRemovedMember(doc, modifier.$set, (memberId) => {
foreachRemovedMember(doc, modifier.$set, memberId => {
Cards.update(
{ boardId },
{
@ -1052,7 +1047,7 @@ if (Meteor.isServer) {
watchers: memberId,
},
},
{ multi: true }
{ multi: true },
);
Lists.update(
@ -1062,7 +1057,7 @@ if (Meteor.isServer) {
watchers: memberId,
},
},
{ multi: true }
{ multi: true },
);
const board = Boards._transform(doc);
@ -1112,7 +1107,7 @@ if (Meteor.isServer) {
// Say goodbye to the former member
if (modifier.$set) {
foreachRemovedMember(doc, modifier.$set, (memberId) => {
foreachRemovedMember(doc, modifier.$set, memberId => {
Activities.insert({
userId,
memberId,
@ -1143,7 +1138,7 @@ if (Meteor.isServer) {
// admins can access boards of any user
Authentication.checkAdminOrCondition(
req.userId,
req.userId === paramUserId
req.userId === paramUserId,
);
const data = Boards.find(
@ -1153,7 +1148,7 @@ if (Meteor.isServer) {
},
{
sort: ['title'],
}
},
).map(function(board) {
return {
_id: board._id,
@ -1332,7 +1327,7 @@ if (Meteor.isServer) {
if (!board.getLabel(name, color)) {
Boards.direct.update(
{ _id: id },
{ $push: { labels: { _id: labelId, name, color } } }
{ $push: { labels: { _id: labelId, name, color } } },
);
JsonRoutes.sendResult(res, {
code: 200,
@ -1364,7 +1359,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('POST', '/api/boards/:boardId/members/:memberId', function(
req,
res
res,
) {
try {
const boardId = req.params.boardId;
@ -1384,7 +1379,7 @@ if (Meteor.isServer) {
isTrue(isAdmin),
isTrue(isNoComments),
isTrue(isCommentOnly),
req.userId
req.userId,
);
JsonRoutes.sendResult(res, {

17
models/cardComments.js
View file

@ -64,7 +64,7 @@ CardComments.attachSchema(
}
},
},
})
}),
);
CardComments.allow({
@ -107,11 +107,6 @@ function commentCreation(userId, doc) {
});
}
CardComments.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
if (Meteor.isServer) {
// Comments are often fetched within a card, so we create an index to make these
// queries more efficient.
@ -125,7 +120,6 @@ if (Meteor.isServer) {
});
CardComments.after.update((userId, doc) => {
const activity = Activities.findOne({ commentId: doc._id });
const card = Cards.findOne(doc.cardId);
Activities.insert({
userId,
@ -139,7 +133,6 @@ if (Meteor.isServer) {
});
CardComments.before.remove((userId, doc) => {
const activity = Activities.findOne({ commentId: doc._id });
const card = Cards.findOne(doc.cardId);
Activities.insert({
userId,
@ -174,7 +167,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('GET', '/api/boards/:boardId/cards/:cardId/comments', function(
req,
res
res,
) {
try {
Authentication.checkUserId(req.userId);
@ -233,7 +226,7 @@ if (Meteor.isServer) {
data: error,
});
}
}
},
);
/**
@ -280,7 +273,7 @@ if (Meteor.isServer) {
data: error,
});
}
}
},
);
/**
@ -318,7 +311,7 @@ if (Meteor.isServer) {
data: error,
});
}
}
},
);
}

632
models/cards.js
View file

File diff suppressed because it is too large Load diff

17
models/checklistItems.js
View file

@ -61,7 +61,7 @@ ChecklistItems.attachSchema(
}
},
},
})
}),
);
ChecklistItems.allow({
@ -225,11 +225,6 @@ if (Meteor.isServer) {
publishChekListUncompleted(userId, doc, fieldNames);
});
ChecklistItems.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
ChecklistItems.after.insert((userId, doc) => {
itemCreation(userId, doc);
});
@ -281,7 +276,7 @@ if (Meteor.isServer) {
code: 500,
});
}
}
},
);
/**
@ -308,13 +303,13 @@ if (Meteor.isServer) {
if (req.body.hasOwnProperty('isFinished')) {
ChecklistItems.direct.update(
{ _id: paramItemId },
{ $set: { isFinished: req.body.isFinished } }
{ $set: { isFinished: req.body.isFinished } },
);
}
if (req.body.hasOwnProperty('title')) {
ChecklistItems.direct.update(
{ _id: paramItemId },
{ $set: { title: req.body.title } }
{ $set: { title: req.body.title } },
);
}
@ -324,7 +319,7 @@ if (Meteor.isServer) {
_id: paramItemId,
},
});
}
},
);
/**
@ -353,7 +348,7 @@ if (Meteor.isServer) {
_id: paramItemId,
},
});
}
},
);
}

23
models/checklists.js
View file

@ -59,7 +59,7 @@ Checklists.attachSchema(
type: Number,
decimal: true,
},
})
}),
);
Checklists.helpers({
@ -68,7 +68,7 @@ Checklists.helpers({
this._id = null;
this.cardId = newCardId;
const newChecklistId = Checklists.insert(this);
ChecklistItems.find({ checklistId: oldChecklistId }).forEach((item) => {
ChecklistItems.find({ checklistId: oldChecklistId }).forEach(item => {
item._id = null;
item.checklistId = newChecklistId;
item.cardId = newCardId;
@ -84,7 +84,7 @@ Checklists.helpers({
{
checklistId: this._id,
},
{ sort: ['sort'] }
{ sort: ['sort'] },
);
},
finishedCount() {
@ -160,16 +160,11 @@ if (Meteor.isServer) {
});
});
Checklists.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
Checklists.before.remove((userId, doc) => {
const activities = Activities.find({ checklistId: doc._id });
const card = Cards.findOne(doc.cardId);
if (activities) {
activities.forEach((activity) => {
activities.forEach(activity => {
Activities.remove(activity._id);
});
}
@ -203,7 +198,7 @@ if (Meteor.isServer) {
Authentication.checkUserId(req.userId);
const paramCardId = req.params.cardId;
const checklists = Checklists.find({ cardId: paramCardId }).map(function(
doc
doc,
) {
return {
_id: doc._id,
@ -220,7 +215,7 @@ if (Meteor.isServer) {
code: 500,
});
}
}
},
);
/**
@ -269,7 +264,7 @@ if (Meteor.isServer) {
code: 500,
});
}
}
},
);
/**
@ -313,7 +308,7 @@ if (Meteor.isServer) {
code: 400,
});
}
}
},
);
/**
@ -340,7 +335,7 @@ if (Meteor.isServer) {
_id: paramChecklistId,
},
});
}
},
);
}

27
models/customFields.js
View file

@ -95,7 +95,7 @@ CustomFields.attachSchema(
}
},
},
})
}),
);
CustomFields.mutations({
@ -118,7 +118,7 @@ CustomFields.allow({
userId,
Boards.find({
_id: { $in: doc.boardIds },
}).fetch()
}).fetch(),
);
},
update(userId, doc) {
@ -126,7 +126,7 @@ CustomFields.allow({
userId,
Boards.find({
_id: { $in: doc.boardIds },
}).fetch()
}).fetch(),
);
},
remove(userId, doc) {
@ -134,7 +134,7 @@ CustomFields.allow({
userId,
Boards.find({
_id: { $in: doc.boardIds },
}).fetch()
}).fetch(),
);
},
fetch: ['userId', 'boardIds'],
@ -185,17 +185,12 @@ if (Meteor.isServer) {
customFieldCreation(userId, doc);
});
CustomFields.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
CustomFields.before.update((userId, doc, fieldNames, modifier) => {
if (_.contains(fieldNames, 'boardIds') && modifier.$pull) {
Cards.update(
{ boardId: modifier.$pull.boardIds, 'customFields._id': doc._id },
{ $pull: { customFields: { _id: doc._id } } },
{ multi: true }
{ multi: true },
);
customFieldEdit(userId, doc);
Activities.remove({
@ -223,7 +218,7 @@ if (Meteor.isServer) {
Cards.update(
{ boardId: { $in: doc.boardIds }, 'customFields._id': doc._id },
{ $pull: { customFields: { _id: doc._id } } },
{ multi: true }
{ multi: true },
);
});
}
@ -241,7 +236,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('GET', '/api/boards/:boardId/custom-fields', function(
req,
res
res,
) {
Authentication.checkUserId(req.userId);
const paramBoardId = req.params.boardId;
@ -254,7 +249,7 @@ if (Meteor.isServer) {
name: cf.name,
type: cf.type,
};
}
},
),
});
});
@ -281,7 +276,7 @@ if (Meteor.isServer) {
boardIds: { $in: [paramBoardId] },
}),
});
}
},
);
/**
@ -299,7 +294,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('POST', '/api/boards/:boardId/custom-fields', function(
req,
res
res,
) {
Authentication.checkUserId(req.userId);
const paramBoardId = req.params.boardId;
@ -351,7 +346,7 @@ if (Meteor.isServer) {
_id: id,
},
});
}
},
);
}

79
models/export.js
View file

@ -57,7 +57,10 @@ export class Exporter {
build() {
const byBoard = { boardId: this._boardId };
const byBoardNoLinked = { boardId: this._boardId, linkedId: {$in: ['', null] } };
const byBoardNoLinked = {
boardId: this._boardId,
linkedId: { $in: ['', null] },
};
// we do not want to retrieve boardId in related elements
const noBoardId = {
fields: {
@ -67,15 +70,21 @@ export class Exporter {
const result = {
_format: 'wekan-board-1.0.0',
};
_.extend(result, Boards.findOne(this._boardId, {
_.extend(
result,
Boards.findOne(this._boardId, {
fields: {
stars: 0,
},
}));
}),
);
result.lists = Lists.find(byBoard, noBoardId).fetch();
result.cards = Cards.find(byBoardNoLinked, noBoardId).fetch();
result.swimlanes = Swimlanes.find(byBoard, noBoardId).fetch();
result.customFields = CustomFields.find({boardIds: {$in: [this.boardId]}}, {fields: {boardId: 0}}).fetch();
result.customFields = CustomFields.find(
{ boardIds: { $in: [this.boardId] } },
{ fields: { boardId: 0 } },
).fetch();
result.comments = CardComments.find(byBoard, noBoardId).fetch();
result.activities = Activities.find(byBoard, noBoardId).fetch();
result.rules = Rules.find(byBoard, noBoardId).fetch();
@ -84,24 +93,40 @@ export class Exporter {
result.subtaskItems = [];
result.triggers = [];
result.actions = [];
result.cards.forEach((card) => {
result.checklists.push(...Checklists.find({
result.cards.forEach(card => {
result.checklists.push(
...Checklists.find({
cardId: card._id,
}).fetch());
result.checklistItems.push(...ChecklistItems.find({
}).fetch(),
);
result.checklistItems.push(
...ChecklistItems.find({
cardId: card._id,
}).fetch());
result.subtaskItems.push(...Cards.find({
}).fetch(),
);
result.subtaskItems.push(
...Cards.find({
parentid: card._id,
}).fetch());
}).fetch(),
);
});
result.rules.forEach((rule) => {
result.triggers.push(...Triggers.find({
result.rules.forEach(rule => {
result.triggers.push(
...Triggers.find(
{
_id: rule.triggerId,
}, noBoardId).fetch());
result.actions.push(...Actions.find({
},
noBoardId,
).fetch(),
);
result.actions.push(
...Actions.find(
{
_id: rule.actionId,
}, noBoardId).fetch());
},
noBoardId,
).fetch(),
);
});
// [Old] for attachments we only export IDs and absolute url to original doc
@ -122,7 +147,9 @@ export class Exporter {
});
};
const getBase64DataSync = Meteor.wrapAsync(getBase64Data);
result.attachments = Attachments.find(byBoard).fetch().map((attachment) => {
result.attachments = Attachments.find(byBoard)
.fetch()
.map(attachment => {
return {
_id: attachment._id,
cardId: attachment.cardId,
@ -138,27 +165,27 @@ export class Exporter {
// 1- only exports users that are linked somehow to that board
// 2- do not export any sensitive information
const users = {};
result.members.forEach((member) => {
result.members.forEach(member => {
users[member.userId] = true;
});
result.lists.forEach((list) => {
result.lists.forEach(list => {
users[list.userId] = true;
});
result.cards.forEach((card) => {
result.cards.forEach(card => {
users[card.userId] = true;
if (card.members) {
card.members.forEach((memberId) => {
card.members.forEach(memberId => {
users[memberId] = true;
});
}
});
result.comments.forEach((comment) => {
result.comments.forEach(comment => {
users[comment.userId] = true;
});
result.activities.forEach((activity) => {
result.activities.forEach(activity => {
users[activity.userId] = true;
});
result.checklists.forEach((checklist) => {
result.checklists.forEach(checklist => {
users[checklist.userId] = true;
});
const byUserIds = {
@ -177,7 +204,9 @@ export class Exporter {
'profile.avatarUrl': 1,
},
};
result.users = Users.find(byUserIds, userFields).fetch().map((user) => {
result.users = Users.find(byUserIds, userFields)
.fetch()
.map(user => {
// user avatar is stored as a relative url, we export absolute
if ((user.profile || {}).avatarUrl) {
user.profile.avatarUrl = FlowRouter.url(user.profile.avatarUrl);

2
models/import.js
View file

@ -44,5 +44,3 @@ Meteor.methods({
return creator.create(data, currentBoardId);
},
});

43
models/integrations.js
View file

@ -86,14 +86,9 @@ Integrations.attachSchema(
*/
type: String,
},
})
}),
);
Integrations.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
Integrations.allow({
insert(userId, doc) {
return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
@ -123,7 +118,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('GET', '/api/boards/:boardId/integrations', function(
req,
res
res,
) {
try {
const paramBoardId = req.params.boardId;
@ -131,7 +126,7 @@ if (Meteor.isServer) {
const data = Integrations.find(
{ boardId: paramBoardId },
{ fields: { token: 0 } }
{ fields: { token: 0 } },
).map(function(doc) {
return doc;
});
@ -155,7 +150,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('GET', '/api/boards/:boardId/integrations/:intId', function(
req,
res
res,
) {
try {
const paramBoardId = req.params.boardId;
@ -166,7 +161,7 @@ if (Meteor.isServer) {
code: 200,
data: Integrations.findOne(
{ _id: paramIntId, boardId: paramBoardId },
{ fields: { token: 0 } }
{ fields: { token: 0 } },
),
});
} catch (error) {
@ -187,7 +182,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('POST', '/api/boards/:boardId/integrations', function(
req,
res
res,
) {
try {
const paramBoardId = req.params.boardId;
@ -228,7 +223,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('PUT', '/api/boards/:boardId/integrations/:intId', function(
req,
res
res,
) {
try {
const paramBoardId = req.params.boardId;
@ -239,35 +234,35 @@ if (Meteor.isServer) {
const newEnabled = req.body.enabled;
Integrations.direct.update(
{ _id: paramIntId, boardId: paramBoardId },
{ $set: { enabled: newEnabled } }
{ $set: { enabled: newEnabled } },
);
}
if (req.body.hasOwnProperty('title')) {
const newTitle = req.body.title;
Integrations.direct.update(
{ _id: paramIntId, boardId: paramBoardId },
{ $set: { title: newTitle } }
{ $set: { title: newTitle } },
);
}
if (req.body.hasOwnProperty('url')) {
const newUrl = req.body.url;
Integrations.direct.update(
{ _id: paramIntId, boardId: paramBoardId },
{ $set: { url: newUrl } }
{ $set: { url: newUrl } },
);
}
if (req.body.hasOwnProperty('token')) {
const newToken = req.body.token;
Integrations.direct.update(
{ _id: paramIntId, boardId: paramBoardId },
{ $set: { token: newToken } }
{ $set: { token: newToken } },
);
}
if (req.body.hasOwnProperty('activities')) {
const newActivities = req.body.activities;
Integrations.direct.update(
{ _id: paramIntId, boardId: paramBoardId },
{ $set: { activities: newActivities } }
{ $set: { activities: newActivities } },
);
}
@ -306,14 +301,14 @@ if (Meteor.isServer) {
Integrations.direct.update(
{ _id: paramIntId, boardId: paramBoardId },
{ $pullAll: { activities: newActivities } }
{ $pullAll: { activities: newActivities } },
);
JsonRoutes.sendResult(res, {
code: 200,
data: Integrations.findOne(
{ _id: paramIntId, boardId: paramBoardId },
{ fields: { _id: 1, activities: 1 } }
{ fields: { _id: 1, activities: 1 } },
),
});
} catch (error) {
@ -322,7 +317,7 @@ if (Meteor.isServer) {
data: error,
});
}
}
},
);
/**
@ -346,14 +341,14 @@ if (Meteor.isServer) {
Integrations.direct.update(
{ _id: paramIntId, boardId: paramBoardId },
{ $addToSet: { activities: { $each: newActivities } } }
{ $addToSet: { activities: { $each: newActivities } } },
);
JsonRoutes.sendResult(res, {
code: 200,
data: Integrations.findOne(
{ _id: paramIntId, boardId: paramBoardId },
{ fields: { _id: 1, activities: 1 } }
{ fields: { _id: 1, activities: 1 } },
),
});
} catch (error) {
@ -362,7 +357,7 @@ if (Meteor.isServer) {
data: error,
});
}
}
},
);
/**
@ -375,7 +370,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('DELETE', '/api/boards/:boardId/integrations/:intId', function(
req,
res
res,
) {
try {
const paramBoardId = req.params.boardId;

7
models/invitationCodes.js
View file

@ -47,7 +47,7 @@ InvitationCodes.attachSchema(
type: Boolean,
defaultValue: true,
},
})
}),
);
InvitationCodes.helpers({
@ -56,11 +56,6 @@ InvitationCodes.helpers({
},
});
InvitationCodes.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
// InvitationCodes.before.insert((userId, doc) => {
// doc.createdAt = new Date();
// doc.authorId = userId;

21
models/lists.js
View file

@ -156,7 +156,7 @@ Lists.attachSchema(
type: String,
defaultValue: 'list',
},
})
}),
);
Lists.allow({
@ -198,7 +198,7 @@ Lists.helpers({
swimlaneId: oldSwimlaneId,
listId: oldId,
archived: false,
}).forEach((card) => {
}).forEach(card => {
card.copy(boardId, swimlaneId, _id);
});
},
@ -262,7 +262,7 @@ Lists.mutations({
archive() {
if (this.isTemplateList()) {
this.cards().forEach((card) => {
this.cards().forEach(card => {
return card.archive();
});
}
@ -271,7 +271,7 @@ Lists.mutations({
restore() {
if (this.isTemplateList()) {
this.allCards().forEach((card) => {
this.allCards().forEach(card => {
return card.restore();
});
}
@ -346,15 +346,10 @@ if (Meteor.isServer) {
});
});
Lists.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
Lists.before.remove((userId, doc) => {
const cards = Cards.find({ listId: doc._id });
if (cards) {
cards.forEach((card) => {
cards.forEach(card => {
Cards.remove(card._id);
});
}
@ -404,7 +399,7 @@ if (Meteor.isServer) {
_id: doc._id,
title: doc.title,
};
}
},
),
});
} catch (error) {
@ -425,7 +420,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('GET', '/api/boards/:boardId/lists/:listId', function(
req,
res
res,
) {
try {
const paramBoardId = req.params.boardId;
@ -492,7 +487,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('DELETE', '/api/boards/:boardId/lists/:listId', function(
req,
res
res,
) {
try {
Authentication.checkUserId(req.userId);

7
models/rules.js
View file

@ -44,7 +44,7 @@ Rules.attachSchema(
}
},
},
})
}),
);
Rules.mutations({
@ -74,11 +74,6 @@ Rules.allow({
},
});
Rules.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
if (Meteor.isServer) {
Meteor.startup(() => {
Rules._collection._ensureIndex({ modifiedAt: -1 });

25
models/settings.js
View file

@ -76,7 +76,7 @@ Settings.attachSchema(
}
},
},
})
}),
);
Settings.helpers({
mailUrl() {
@ -88,7 +88,7 @@ Settings.helpers({
return `${protocol}${this.mailServer.host}:${this.mailServer.port}/`;
}
return `${protocol}${this.mailServer.username}:${encodeURIComponent(
this.mailServer.password
this.mailServer.password,
)}@${this.mailServer.host}:${this.mailServer.port}/`;
},
});
@ -99,11 +99,6 @@ Settings.allow({
},
});
Settings.before.update((userId, doc, fieldNames, modifier) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = new Date();
});
if (Meteor.isServer) {
Meteor.startup(() => {
Settings._collection._ensureIndex({ modifiedAt: -1 });
@ -111,7 +106,7 @@ if (Meteor.isServer) {
if (!setting) {
const now = new Date();
const domain = process.env.ROOT_URL.match(
/\/\/(?:www\.)?(.*)?(?:\/)?/
/\/\/(?:www\.)?(.*)?(?:\/)?/,
)[1];
const from = `Boards Support <support@${domain}>`;
const defaultSetting = {
@ -143,9 +138,7 @@ if (Meteor.isServer) {
if (_.contains(fieldNames, 'mailServer') && doc.mailServer.host) {
const protocol = doc.mailServer.enableTLS ? 'smtps://' : 'smtp://';
if (!doc.mailServer.username && !doc.mailServer.password) {
process.env.MAIL_URL = `${protocol}${doc.mailServer.host}:${
doc.mailServer.port
}/`;
process.env.MAIL_URL = `${protocol}${doc.mailServer.host}:${doc.mailServer.port}/`;
} else {
process.env.MAIL_URL = `${protocol}${
doc.mailServer.username
@ -220,14 +213,14 @@ if (Meteor.isServer) {
if (!user.isAdmin) {
throw new Meteor.Error('not-allowed');
}
emails.forEach((email) => {
emails.forEach(email => {
if (email && SimpleSchema.RegEx.Email.test(email)) {
// Checks if the email is already link to an account.
const userExist = Users.findOne({ email });
if (userExist) {
throw new Meteor.Error(
'user-exist',
`The user with the email ${email} has already an account.`
`The user with the email ${email} has already an account.`,
);
}
// Checks if the email is already link to an invitation.
@ -253,10 +246,10 @@ if (Meteor.isServer) {
} else {
throw new Meteor.Error(
'invitation-generated-fail',
err.message
err.message,
);
}
}
},
);
}
}
@ -284,7 +277,7 @@ if (Meteor.isServer) {
throw new Meteor.Error(
'email-fail',
`${TAPi18n.__('email-fail-text', { lng: lang })}: ${message}`,
message
message,
);
}
return {

27
models/swimlanes.js
View file

@ -120,7 +120,7 @@ Swimlanes.attachSchema(
type: String,
defaultValue: 'swimlane',
},
})
}),
);
Swimlanes.allow({
@ -153,7 +153,7 @@ Swimlanes.helpers({
}
// Copy all lists in swimlane
Lists.find(query).forEach((list) => {
Lists.find(query).forEach(list => {
list.type = 'list';
list.swimlaneId = oldId;
list.boardId = boardId;
@ -167,7 +167,7 @@ Swimlanes.helpers({
swimlaneId: this._id,
archived: false,
}),
{ sort: ['sort'] }
{ sort: ['sort'] },
);
},
@ -178,7 +178,7 @@ Swimlanes.helpers({
swimlaneId: { $in: [this._id, ''] },
archived: false,
},
{ sort: ['sort'] }
{ sort: ['sort'] },
);
},
@ -234,7 +234,7 @@ Swimlanes.mutations({
archive() {
if (this.isTemplateSwimlane()) {
this.myLists().forEach((list) => {
this.myLists().forEach(list => {
return list.archive();
});
}
@ -243,7 +243,7 @@ Swimlanes.mutations({
restore() {
if (this.isTemplateSwimlane()) {
this.myLists().forEach((list) => {
this.myLists().forEach(list => {
return list.restore();
});
}
@ -262,11 +262,6 @@ Swimlanes.mutations({
},
});
Swimlanes.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
Swimlanes.hookOptions.after.update = { fetchPrevious: false };
if (Meteor.isServer) {
@ -292,11 +287,11 @@ if (Meteor.isServer) {
swimlaneId: { $in: [doc._id, ''] },
archived: false,
},
{ sort: ['sort'] }
{ sort: ['sort'] },
);
if (lists.count() < 2) {
lists.forEach((list) => {
lists.forEach(list => {
list.remove();
});
} else {
@ -350,7 +345,7 @@ if (Meteor.isServer) {
_id: doc._id,
title: doc.title,
};
}
},
),
});
} catch (error) {
@ -372,7 +367,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('GET', '/api/boards/:boardId/swimlanes/:swimlaneId', function(
req,
res
res,
) {
try {
const paramBoardId = req.params.boardId;
@ -459,7 +454,7 @@ if (Meteor.isServer) {
data: error,
});
}
}
},
);
}

118
models/trelloCreator.js
View file

@ -76,31 +76,37 @@ export class TrelloCreator {
}
checkActions(trelloActions) {
check(trelloActions, [Match.ObjectIncluding({
check(trelloActions, [
Match.ObjectIncluding({
data: Object,
date: DateString,
type: String,
})]);
}),
]);
// XXX we could perform more thorough checks based on action type
}
checkBoard(trelloBoard) {
check(trelloBoard, Match.ObjectIncluding({
check(
trelloBoard,
Match.ObjectIncluding({
closed: Boolean,
name: String,
prefs: Match.ObjectIncluding({
// XXX refine control by validating 'background' against a list of
// allowed values (is it worth the maintenance?)
background: String,
permissionLevel: Match.Where((value) => {
permissionLevel: Match.Where(value => {
return ['org', 'private', 'public'].indexOf(value) >= 0;
}),
}),
}));
}),
);
}
checkCards(trelloCards) {
check(trelloCards, [Match.ObjectIncluding({
check(trelloCards, [
Match.ObjectIncluding({
closed: Boolean,
dateLastActivity: DateString,
desc: String,
@ -108,34 +114,43 @@ export class TrelloCreator {
idMembers: [String],
name: String,
pos: Number,
})]);
}),
]);
}
checkLabels(trelloLabels) {
check(trelloLabels, [Match.ObjectIncluding({
check(trelloLabels, [
Match.ObjectIncluding({
// XXX refine control by validating 'color' against a list of allowed
// values (is it worth the maintenance?)
name: String,
})]);
}),
]);
}
checkLists(trelloLists) {
check(trelloLists, [Match.ObjectIncluding({
check(trelloLists, [
Match.ObjectIncluding({
closed: Boolean,
name: String,
})]);
}),
]);
}
checkChecklists(trelloChecklists) {
check(trelloChecklists, [Match.ObjectIncluding({
check(trelloChecklists, [
Match.ObjectIncluding({
idBoard: String,
idCard: String,
name: String,
checkItems: [Match.ObjectIncluding({
checkItems: [
Match.ObjectIncluding({
state: String,
name: String,
})],
})]);
}),
],
}),
]);
}
// You must call parseActions before calling this one.
@ -146,14 +161,16 @@ export class TrelloCreator {
// very old boards won't have a creation activity so no creation date
createdAt: this._now(this.createdAt.board),
labels: [],
members: [{
members: [
{
userId: Meteor.userId(),
isAdmin: true,
isActive: true,
isNoComments: false,
isCommentOnly: false,
swimlaneId: false,
}],
},
],
permission: this.getPermission(trelloBoard.prefs.permissionLevel),
slug: getSlug(trelloBoard.name) || 'board',
stars: 0,
@ -161,13 +178,15 @@ export class TrelloCreator {
};
// now add other members
if (trelloBoard.memberships) {
trelloBoard.memberships.forEach((trelloMembership) => {
trelloBoard.memberships.forEach(trelloMembership => {
const trelloId = trelloMembership.idMember;
// do we have a mapping?
if (this.members[trelloId]) {
const wekanId = this.members[trelloId];
// do we already have it in our list?
const wekanMember = boardToCreate.members.find((wekanMember) => wekanMember.userId === wekanId);
const wekanMember = boardToCreate.members.find(
wekanMember => wekanMember.userId === wekanId,
);
if (wekanMember) {
// we're already mapped, but maybe with lower rights
if (!wekanMember.isAdmin) {
@ -186,7 +205,7 @@ export class TrelloCreator {
}
});
}
trelloBoard.labels.forEach((label) => {
trelloBoard.labels.forEach(label => {
const labelToCreate = {
_id: Random.id(6),
color: label.color ? label.color : 'black',
@ -225,7 +244,7 @@ export class TrelloCreator {
*/
createCards(trelloCards, boardId) {
const result = [];
trelloCards.forEach((card) => {
trelloCards.forEach(card => {
const cardToCreate = {
archived: card.closed,
boardId,
@ -243,7 +262,7 @@ export class TrelloCreator {
};
// add labels
if (card.idLabels) {
cardToCreate.labelIds = card.idLabels.map((trelloId) => {
cardToCreate.labelIds = card.idLabels.map(trelloId => {
return this.labels[trelloId];
});
}
@ -251,12 +270,12 @@ export class TrelloCreator {
if (card.idMembers) {
const wekanMembers = [];
// we can't just map, as some members may not have been mapped
card.idMembers.forEach((trelloId) => {
card.idMembers.forEach(trelloId => {
if (this.members[trelloId]) {
const wekanId = this.members[trelloId];
// we may map multiple Trello members to the same wekan user
// in which case we risk adding the same user multiple times
if(!wekanMembers.find((wId) => wId === wekanId)){
if (!wekanMembers.find(wId => wId === wekanId)) {
wekanMembers.push(wekanId);
}
}
@ -289,7 +308,7 @@ export class TrelloCreator {
// add comments
const comments = this.comments[card.id];
if (comments) {
comments.forEach((comment) => {
comments.forEach(comment => {
const commentToCreate = {
boardId,
cardId,
@ -318,7 +337,7 @@ export class TrelloCreator {
const attachments = this.attachments[card.id];
const trelloCoverId = card.idAttachmentCover;
if (attachments) {
attachments.forEach((att) => {
attachments.forEach(att => {
const file = new FS.File();
// Simulating file.attachData on the client generates multiple errors
// - HEAD returns null, which causes exception down the line
@ -334,7 +353,7 @@ export class TrelloCreator {
// attachments' related activities automatically
file.source = 'import';
if (error) {
throw(error);
throw error;
} else {
const wekanAtt = Attachments.insert(file, () => {
// we do nothing
@ -342,7 +361,9 @@ export class TrelloCreator {
self.attachmentIds[att.id] = wekanAtt._id;
//
if (trelloCoverId === att.id) {
Cards.direct.update(cardId, { $set: {coverId: wekanAtt._id}});
Cards.direct.update(cardId, {
$set: { coverId: wekanAtt._id },
});
}
}
});
@ -357,7 +378,7 @@ export class TrelloCreator {
// Create labels if they do not exist and load this.labels.
createLabels(trelloLabels, board) {
trelloLabels.forEach((label) => {
trelloLabels.forEach(label => {
const color = label.color;
const name = label.name;
const existingLabel = board.getLabel(name, color);
@ -371,7 +392,7 @@ export class TrelloCreator {
}
createLists(trelloLists, boardId) {
trelloLists.forEach((list) => {
trelloLists.forEach(list => {
const listToCreate = {
archived: list.closed,
boardId,
@ -384,7 +405,7 @@ export class TrelloCreator {
sort: list.pos,
};
const listId = Lists.direct.insert(listToCreate);
Lists.direct.update(listId, {$set: {'updatedAt': this._now()}});
Lists.direct.update(listId, { $set: { updatedAt: this._now() } });
this.lists[list.id] = listId;
// log activity
// Activities.direct.insert({
@ -416,12 +437,12 @@ export class TrelloCreator {
sort: 1,
};
const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate);
Swimlanes.direct.update(swimlaneId, {$set: {'updatedAt': this._now()}});
Swimlanes.direct.update(swimlaneId, { $set: { updatedAt: this._now() } });
this.swimlane = swimlaneId;
}
createChecklists(trelloChecklists) {
trelloChecklists.forEach((checklist) => {
trelloChecklists.forEach(checklist => {
if (this.cards[checklist.idCard]) {
// Create the checklist
const checklistToCreate = {
@ -435,7 +456,7 @@ export class TrelloCreator {
this.checklists[checklist.id] = checklistId;
// Now add the items to the checklistItems
let counter = 0;
checklist.checkItems.forEach((item) => {
checklist.checkItems.forEach(item => {
counter++;
const checklistItemTocreate = {
_id: checklistId + counter,
@ -458,15 +479,15 @@ export class TrelloCreator {
getColor(trelloColorCode) {
// trello color name => wekan color
const mapColors = {
'blue': 'belize',
'orange': 'pumpkin',
'green': 'nephritis',
'red': 'pomegranate',
'purple': 'wisteria',
'pink': 'pomegranate',
'lime': 'nephritis',
'sky': 'belize',
'grey': 'midnight',
blue: 'belize',
orange: 'pumpkin',
green: 'nephritis',
red: 'pomegranate',
purple: 'wisteria',
pink: 'pomegranate',
lime: 'nephritis',
sky: 'belize',
grey: 'midnight',
};
const wekanColor = mapColors[trelloColorCode];
return wekanColor || Boards.simpleSchema()._schema.color.allowedValues[0];
@ -482,7 +503,7 @@ export class TrelloCreator {
}
parseActions(trelloActions) {
trelloActions.forEach((action) => {
trelloActions.forEach(action => {
if (action.type === 'addAttachmentToCard') {
// We have to be cautious, because the attachment could have been removed later.
// In that case Trello still reports its addition, but removes its 'url' field.
@ -520,7 +541,7 @@ export class TrelloCreator {
}
importActions(actions, boardId) {
actions.forEach((action) => {
actions.forEach(action => {
switch (action.type) {
// Board related actions
// TODO: addBoardMember, removeBoardMember
@ -601,7 +622,8 @@ export class TrelloCreator {
createdAt: this._now(action.date),
});
break;
}}
}
}
// Trello doesn't have an add checklist item action
});
}
@ -624,7 +646,9 @@ export class TrelloCreator {
create(board, currentBoardId) {
// TODO : Make isSandstorm variable global
const isSandstorm = Meteor.settings && Meteor.settings.public &&
const isSandstorm =
Meteor.settings &&
Meteor.settings.public &&
Meteor.settings.public.sandstorm;
if (isSandstorm && currentBoardId) {
const currentBoard = Boards.findOne(currentBoardId);

7
models/triggers.js
View file

@ -51,18 +51,13 @@ Triggers.helpers({
labels() {
const boardLabels = this.board().labels;
const cardLabels = _.filter(boardLabels, (label) => {
const cardLabels = _.filter(boardLabels, label => {
return _.contains(this.labelIds, label._id);
});
return cardLabels;
},
});
Triggers.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
if (Meteor.isServer) {
Meteor.startup(() => {
Triggers._collection._ensureIndex({ modifiedAt: -1 });

9
models/unsavedEdits.js
View file

@ -46,14 +46,7 @@ UnsavedEditCollection.attachSchema(
}
},
},
})
);
UnsavedEditCollection.before.update(
(userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
}
}),
);
if (Meteor.isServer) {

40
models/users.js
View file

@ -247,7 +247,7 @@ Users.attachSchema(
optional: false,
defaultValue: 'password',
},
})
}),
);
Users.allow({
@ -259,7 +259,7 @@ Users.allow({
const adminsNumber = Users.find({ isAdmin: true }).count();
const { isAdmin } = Users.findOne(
{ _id: userId },
{ fields: { isAdmin: 1 } }
{ fields: { isAdmin: 1 } },
);
// Prevents remove of the only one administrator
@ -533,7 +533,7 @@ Meteor.methods({
check(email, String);
const existingUser = Users.findOne(
{ 'emails.address': email },
{ fields: { _id: 1 } }
{ fields: { _id: 1 } },
);
if (existingUser) {
throw new Meteor.Error('email-already-taken');
@ -700,7 +700,7 @@ if (Meteor.isServer) {
if (!options || !options.profile) {
throw new Meteor.Error(
'error-invitation-code-blank',
'The invitation code is required'
'The invitation code is required',
);
}
const invitationCode = InvitationCodes.findOne({
@ -711,7 +711,8 @@ if (Meteor.isServer) {
if (!invitationCode) {
throw new Meteor.Error(
'error-invitation-code-not-exist',
'The invitation code doesn\'t exist'
// eslint-disable-next-line quotes
"The invitation code doesn't exist",
);
} else {
user.profile = { icode: options.profile.invitationcode };
@ -722,18 +723,13 @@ if (Meteor.isServer) {
Meteor.bindEnvironment(() => {
InvitationCodes.remove({ _id: invitationCode._id });
}),
200
200,
);
return user;
}
});
}
Users.before.update((userId, doc, fieldNames, modifier, options) => {
modifier.$set = modifier.$set || {};
modifier.$set.modifiedAt = Date.now();
});
if (Meteor.isServer) {
// Let mongoDB ensure username unicity
Meteor.startup(() => {
@ -742,7 +738,7 @@ if (Meteor.isServer) {
{
username: 1,
},
{ unique: true }
{ unique: true },
);
});
@ -786,7 +782,7 @@ if (Meteor.isServer) {
// b. We use it to find deleted and newly inserted ids by using it in one
// direction and then in the other.
function incrementBoards(boardsIds, inc) {
boardsIds.forEach((boardId) => {
boardsIds.forEach(boardId => {
Boards.update(boardId, { $inc: { stars: inc } });
});
}
@ -855,7 +851,7 @@ if (Meteor.isServer) {
Users.update(fakeUserId.get(), {
$set: { 'profile.cardTemplatesSwimlaneId': swimlaneId },
});
}
},
);
// Insert the list templates swimlane
@ -872,7 +868,7 @@ if (Meteor.isServer) {
Users.update(fakeUserId.get(), {
$set: { 'profile.listTemplatesSwimlaneId': swimlaneId },
});
}
},
);
// Insert the board templates swimlane
@ -889,9 +885,9 @@ if (Meteor.isServer) {
Users.update(fakeUserId.get(), {
$set: { 'profile.boardTemplatesSwimlaneId': swimlaneId },
});
}
},
);
}
},
);
});
});
@ -921,7 +917,7 @@ if (Meteor.isServer) {
if (!invitationCode) {
throw new Meteor.Error('error-invitation-code-not-exist');
} else {
invitationCode.boardsToBeInvited.forEach((boardId) => {
invitationCode.boardsToBeInvited.forEach(boardId => {
const board = Boards.findOne(boardId);
board.addMember(doc._id);
});
@ -1071,7 +1067,7 @@ if (Meteor.isServer) {
loginDisabled: true,
'services.resume.loginTokens': '',
},
}
},
);
} else if (action === 'enableLogin') {
Users.update({ _id: id }, { $set: { loginDisabled: '' } });
@ -1112,7 +1108,7 @@ if (Meteor.isServer) {
*/
JsonRoutes.add('POST', '/api/boards/:boardId/members/:userId/add', function(
req,
res
res,
) {
try {
Authentication.checkUserId(req.userId);
@ -1136,7 +1132,7 @@ if (Meteor.isServer) {
isTrue(isAdmin),
isTrue(isNoComments),
isTrue(isCommentOnly),
userId
userId,
);
}
return {
@ -1207,7 +1203,7 @@ if (Meteor.isServer) {
data: error,
});
}
}
},
);
/**

4
models/watchable.js
View file

@ -1,5 +1,5 @@
// simple version, only toggle watch / unwatch
const simpleWatchable = (collection) => {
const simpleWatchable = collection => {
collection.attachSchema({
watchers: {
type: [String],
@ -34,7 +34,7 @@ const simpleWatchable = (collection) => {
const complexWatchOptions = ['watching', 'tracking', 'muted'];
const complexWatchDefault = 'muted';
const complexWatchable = (collection) => {
const complexWatchable = collection => {
collection.attachSchema({
'watchers.$.userId': {
type: String,

189
models/wekanCreator.js
View file

@ -87,86 +87,107 @@ export class WekanCreator {
}
checkActivities(wekanActivities) {
check(wekanActivities, [Match.ObjectIncluding({
check(wekanActivities, [
Match.ObjectIncluding({
activityType: String,
createdAt: DateString,
})]);
}),
]);
// XXX we could perform more thorough checks based on action type
}
checkBoard(wekanBoard) {
check(wekanBoard, Match.ObjectIncluding({
check(
wekanBoard,
Match.ObjectIncluding({
archived: Boolean,
title: String,
// XXX refine control by validating 'color' against a list of
// allowed values (is it worth the maintenance?)
color: String,
permission: Match.Where((value) => {
permission: Match.Where(value => {
return ['private', 'public'].indexOf(value) >= 0;
}),
}));
}),
);
}
checkCards(wekanCards) {
check(wekanCards, [Match.ObjectIncluding({
check(wekanCards, [
Match.ObjectIncluding({
archived: Boolean,
dateLastActivity: DateString,
labelIds: [String],
title: String,
sort: Number,
})]);
}),
]);
}
checkLabels(wekanLabels) {
check(wekanLabels, [Match.ObjectIncluding({
check(wekanLabels, [
Match.ObjectIncluding({
// XXX refine control by validating 'color' against a list of allowed
// values (is it worth the maintenance?)
color: String,
})]);
}),
]);
}
checkLists(wekanLists) {
check(wekanLists, [Match.ObjectIncluding({
check(wekanLists, [
Match.ObjectIncluding({
archived: Boolean,
title: String,
})]);
}),
]);
}
checkSwimlanes(wekanSwimlanes) {
check(wekanSwimlanes, [Match.ObjectIncluding({
check(wekanSwimlanes, [
Match.ObjectIncluding({
archived: Boolean,
title: String,
})]);
}),
]);
}
checkChecklists(wekanChecklists) {
check(wekanChecklists, [Match.ObjectIncluding({
check(wekanChecklists, [
Match.ObjectIncluding({
cardId: String,
title: String,
})]);
}),
]);
}
checkChecklistItems(wekanChecklistItems) {
check(wekanChecklistItems, [Match.ObjectIncluding({
check(wekanChecklistItems, [
Match.ObjectIncluding({
cardId: String,
title: String,
})]);
}),
]);
}
checkRules(wekanRules) {
check(wekanRules, [Match.ObjectIncluding({
check(wekanRules, [
Match.ObjectIncluding({
triggerId: String,
actionId: String,
title: String,
})]);
}),
]);
}
checkTriggers(wekanTriggers) {
// XXX More check based on trigger type
check(wekanTriggers, [Match.ObjectIncluding({
check(wekanTriggers, [
Match.ObjectIncluding({
activityType: String,
desc: String,
})]);
}),
]);
}
getMembersToMap(data) {
@ -176,10 +197,10 @@ export class WekanCreator {
const membersToMap = data.members;
const users = data.users;
// auto-map based on username
membersToMap.forEach((importedMember) => {
membersToMap.forEach(importedMember => {
importedMember.id = importedMember.userId;
delete importedMember.userId;
const user = users.filter((user) => {
const user = users.filter(user => {
return user._id === importedMember.id;
})[0];
if (user.profile && user.profile.fullname) {
@ -196,10 +217,12 @@ export class WekanCreator {
checkActions(wekanActions) {
// XXX More check based on action type
check(wekanActions, [Match.ObjectIncluding({
check(wekanActions, [
Match.ObjectIncluding({
actionType: String,
desc: String,
})]);
}),
]);
}
// You must call parseActions before calling this one.
@ -210,7 +233,8 @@ export class WekanCreator {
// very old boards won't have a creation activity so no creation date
createdAt: this._now(boardToImport.createdAt),
labels: [],
members: [{
members: [
{
userId: Meteor.userId(),
wekanId: Meteor.userId(),
isActive: true,
@ -218,7 +242,8 @@ export class WekanCreator {
isNoComments: false,
isCommentOnly: false,
swimlaneId: false,
}],
},
],
// Standalone Export has modifiedAt missing, adding modifiedAt to fix it
modifiedAt: this._now(boardToImport.modifiedAt),
permission: boardToImport.permission,
@ -228,16 +253,20 @@ export class WekanCreator {
};
// now add other members
if (boardToImport.members) {
boardToImport.members.forEach((wekanMember) => {
boardToImport.members.forEach(wekanMember => {
// do we already have it in our list?
if (!boardToCreate.members.some((member) => member.wekanId === wekanMember.wekanId))
if (
!boardToCreate.members.some(
member => member.wekanId === wekanMember.wekanId,
)
)
boardToCreate.members.push({
...wekanMember,
userId: wekanMember.wekanId,
});
});
}
boardToImport.labels.forEach((label) => {
boardToImport.labels.forEach(label => {
const labelToCreate = {
_id: Random.id(6),
color: label.color,
@ -279,7 +308,7 @@ export class WekanCreator {
*/
createCards(wekanCards, boardId) {
const result = [];
wekanCards.forEach((card) => {
wekanCards.forEach(card => {
const cardToCreate = {
archived: card.archived,
boardId,
@ -300,7 +329,7 @@ export class WekanCreator {
};
// add labels
if (card.labelIds) {
cardToCreate.labelIds = card.labelIds.map((wekanId) => {
cardToCreate.labelIds = card.labelIds.map(wekanId => {
return this.labels[wekanId];
});
}
@ -308,12 +337,12 @@ export class WekanCreator {
if (card.members) {
const wekanMembers = [];
// we can't just map, as some members may not have been mapped
card.members.forEach((sourceMemberId) => {
card.members.forEach(sourceMemberId => {
if (this.members[sourceMemberId]) {
const wekanId = this.members[sourceMemberId];
// we may map multiple Wekan members to the same wekan user
// in which case we risk adding the same user multiple times
if (!wekanMembers.find((wId) => wId === wekanId)) {
if (!wekanMembers.find(wId => wId === wekanId)) {
wekanMembers.push(wekanId);
}
}
@ -349,7 +378,7 @@ export class WekanCreator {
// add comments
const comments = this.comments[card._id];
if (comments) {
comments.forEach((comment) => {
comments.forEach(comment => {
const commentToCreate = {
boardId,
cardId,
@ -377,7 +406,7 @@ export class WekanCreator {
const attachments = this.attachments[card._id];
const wekanCoverId = card.coverId;
if (attachments) {
attachments.forEach((att) => {
attachments.forEach(att => {
const file = new FS.File();
// Simulating file.attachData on the client generates multiple errors
// - HEAD returns null, which causes exception down the line
@ -394,7 +423,7 @@ export class WekanCreator {
// attachments' related activities automatically
file.source = 'import';
if (error) {
throw (error);
throw error;
} else {
const wekanAtt = Attachments.insert(file, () => {
// we do nothing
@ -411,9 +440,12 @@ export class WekanCreator {
}
});
} else if (att.file) {
file.attachData(new Buffer(att.file, 'base64'), {
file.attachData(
new Buffer(att.file, 'base64'),
{
type: att.type,
}, (error) => {
},
error => {
file.name(att.name);
file.boardId = boardId;
file.cardId = cardId;
@ -422,7 +454,7 @@ export class WekanCreator {
// attachments' related activities automatically
file.source = 'import';
if (error) {
throw (error);
throw error;
} else {
const wekanAtt = Attachments.insert(file, () => {
// we do nothing
@ -437,7 +469,8 @@ export class WekanCreator {
});
}
}
});
},
);
}
}
// todo XXX set cover - if need be
@ -450,7 +483,7 @@ export class WekanCreator {
// Create labels if they do not exist and load this.labels.
createLabels(wekanLabels, board) {
wekanLabels.forEach((label) => {
wekanLabels.forEach(label => {
const color = label.color;
const name = label.name;
const existingLabel = board.getLabel(name, color);
@ -479,7 +512,7 @@ export class WekanCreator {
const listId = Lists.direct.insert(listToCreate);
Lists.direct.update(listId, {
$set: {
'updatedAt': this._now(),
updatedAt: this._now(),
},
});
this.lists[list._id] = listId;
@ -520,7 +553,7 @@ export class WekanCreator {
const swimlaneId = Swimlanes.direct.insert(swimlaneToCreate);
Swimlanes.direct.update(swimlaneId, {
$set: {
'updatedAt': this._now(),
updatedAt: this._now(),
},
});
this.swimlanes[swimlane._id] = swimlaneId;
@ -545,7 +578,7 @@ export class WekanCreator {
}
createTriggers(wekanTriggers, boardId) {
wekanTriggers.forEach((trigger) => {
wekanTriggers.forEach(trigger => {
if (trigger.hasOwnProperty('labelId')) {
trigger.labelId = this.labels[trigger.labelId];
}
@ -560,7 +593,7 @@ export class WekanCreator {
}
createActions(wekanActions, boardId) {
wekanActions.forEach((action) => {
wekanActions.forEach(action => {
if (action.hasOwnProperty('labelId')) {
action.labelId = this.labels[action.labelId];
}
@ -575,7 +608,7 @@ export class WekanCreator {
}
createRules(wekanRules, boardId) {
wekanRules.forEach((rule) => {
wekanRules.forEach(rule => {
// Create the rule
rule.boardId = boardId;
rule.triggerId = this.triggers[rule.triggerId];
@ -595,20 +628,21 @@ export class WekanCreator {
sort: checklistitem.sort ? checklistitem.sort : checklistitemIndex,
isFinished: checklistitem.isFinished,
};
const checklistItemId = ChecklistItems.direct.insert(checklistItemTocreate);
const checklistItemId = ChecklistItems.direct.insert(
checklistItemTocreate,
);
this.checklistItems[checklistitem._id] = checklistItemId;
});
}
parseActivities(wekanBoard) {
wekanBoard.activities.forEach((activity) => {
wekanBoard.activities.forEach(activity => {
switch (activity.activityType) {
case 'addAttachment':
{
case 'addAttachment': {
// We have to be cautious, because the attachment could have been removed later.
// In that case Wekan still reports its addition, but removes its 'url' field.
// So we test for that
const wekanAttachment = wekanBoard.attachments.filter((attachment) => {
const wekanAttachment = wekanBoard.attachments.filter(attachment => {
return attachment._id === activity.attachmentId;
})[0];
@ -625,9 +659,8 @@ export class WekanCreator {
}
break;
}
case 'addComment':
{
const wekanComment = wekanBoard.comments.filter((comment) => {
case 'addComment': {
const wekanComment = wekanBoard.comments.filter(comment => {
return comment._id === activity.commentId;
})[0];
const id = activity.cardId;
@ -637,26 +670,22 @@ export class WekanCreator {
this.comments[id].push(wekanComment);
break;
}
case 'createBoard':
{
case 'createBoard': {
this.createdAt.board = activity.createdAt;
break;
}
case 'createCard':
{
case 'createCard': {
const cardId = activity.cardId;
this.createdAt.cards[cardId] = activity.createdAt;
this.createdBy.cards[cardId] = activity.userId;
break;
}
case 'createList':
{
case 'createList': {
const listId = activity.listId;
this.createdAt.lists[listId] = activity.createdAt;
break;
}
case 'createSwimlane':
{
case 'createSwimlane': {
const swimlaneId = activity.swimlaneId;
this.createdAt.swimlanes[swimlaneId] = activity.createdAt;
break;
@ -666,12 +695,11 @@ export class WekanCreator {
}
importActivities(activities, boardId) {
activities.forEach((activity) => {
activities.forEach(activity => {
switch (activity.activityType) {
// Board related activities
// TODO: addBoardMember, removeBoardMember
case 'createBoard':
{
case 'createBoard': {
Activities.direct.insert({
userId: this._user(activity.userId),
type: 'board',
@ -684,8 +712,7 @@ export class WekanCreator {
}
// List related activities
// TODO: removeList, archivedList
case 'createList':
{
case 'createList': {
Activities.direct.insert({
userId: this._user(activity.userId),
type: 'list',
@ -698,8 +725,7 @@ export class WekanCreator {
}
// Card related activities
// TODO: archivedCard, restoredCard, joinMember, unjoinMember
case 'createCard':
{
case 'createCard': {
Activities.direct.insert({
userId: this._user(activity.userId),
activityType: activity.activityType,
@ -710,8 +736,7 @@ export class WekanCreator {
});
break;
}
case 'moveCard':
{
case 'moveCard': {
Activities.direct.insert({
userId: this._user(activity.userId),
oldListId: this.lists[activity.oldListId],
@ -724,8 +749,7 @@ export class WekanCreator {
break;
}
// Comment related activities
case 'addComment':
{
case 'addComment': {
Activities.direct.insert({
userId: this._user(activity.userId),
activityType: activity.activityType,
@ -737,8 +761,7 @@ export class WekanCreator {
break;
}
// Attachment related activities
case 'addAttachment':
{
case 'addAttachment': {
Activities.direct.insert({
userId: this._user(activity.userId),
type: 'card',
@ -751,8 +774,7 @@ export class WekanCreator {
break;
}
// Checklist related activities
case 'addChecklist':
{
case 'addChecklist': {
Activities.direct.insert({
userId: this._user(activity.userId),
activityType: activity.activityType,
@ -763,8 +785,7 @@ export class WekanCreator {
});
break;
}
case 'addChecklistItem':
{
case 'addChecklistItem': {
Activities.direct.insert({
userId: this._user(activity.userId),
activityType: activity.activityType,
@ -772,7 +793,8 @@ export class WekanCreator {
checklistId: this.checklists[activity.checklistId],
checklistItemId: activity.checklistItemId.replace(
activity.checklistId,
this.checklists[activity.checklistId]),
this.checklists[activity.checklistId],
),
boardId,
createdAt: this._now(activity.createdAt),
});
@ -788,7 +810,6 @@ export class WekanCreator {
// check(data, {
// membersMapping: Match.Optional(Object),
// });
// this.checkActivities(board.activities);
// this.checkBoard(board);
// this.checkLabels(board.labels);
@ -807,7 +828,9 @@ export class WekanCreator {
create(board, currentBoardId) {
// TODO : Make isSandstorm variable global
const isSandstorm = Meteor.settings && Meteor.settings.public &&
const isSandstorm =
Meteor.settings &&
Meteor.settings.public &&
Meteor.settings.public.sandstorm;
if (isSandstorm && currentBoardId) {
const currentBoard = Boards.findOne(currentBoardId);

4
models/wekanmapper.js
View file

@ -5,10 +5,10 @@ export function getMembersToMap(data) {
const membersToMap = data.members;
const users = data.users;
// auto-map based on username
membersToMap.forEach((importedMember) => {
membersToMap.forEach(importedMember => {
importedMember.id = importedMember.userId;
delete importedMember.userId;
const user = users.filter((user) => {
const user = users.filter(user => {
return user._id === importedMember.id;
})[0];
if (user.profile && user.profile.fullname) {

2
package.json
View file

@ -8,7 +8,7 @@
"lint:eslint:fix": "eslint --ext .js --ignore-path .eslintignore --fix .",
"lint:staged": "lint-staged",
"prettify": "prettier --write '**/*.js' '**/*.jsx'",
"test": "npm run --silent lint"
"test": "npm run lint"
},
"lint-staged": {
"*.js": [

144
sandstorm.js
View file

@ -1,7 +1,7 @@
// Sandstorm context is detected using the METEOR_SETTINGS environment variable
// in the package definition.
const isSandstorm = Meteor.settings && Meteor.settings.public &&
Meteor.settings.public.sandstorm;
const isSandstorm =
Meteor.settings && Meteor.settings.public && Meteor.settings.public.sandstorm;
// In sandstorm we only have one board per sandstorm instance. Since we want to
// keep most of our code unchanged, we simply hard-code a board `_id` and
@ -28,15 +28,17 @@ if (isSandstorm && Meteor.isServer) {
const Package = Capnp.importSystem('sandstorm/package.capnp');
const Powerbox = Capnp.importSystem('sandstorm/powerbox.capnp');
const Identity = Capnp.importSystem('sandstorm/identity.capnp');
const SandstormHttpBridge =
Capnp.importSystem('sandstorm/sandstorm-http-bridge.capnp').SandstormHttpBridge;
const SandstormHttpBridge = Capnp.importSystem(
'sandstorm/sandstorm-http-bridge.capnp',
).SandstormHttpBridge;
let httpBridge = null;
let capnpConnection = null;
const bridgeConfig = Capnp.parse(
Package.BridgeConfig,
fs.readFileSync('/sandstorm-http-bridge-config'));
fs.readFileSync('/sandstorm-http-bridge-config'),
);
function getHttpBridge() {
if (!httpBridge) {
@ -54,9 +56,13 @@ if (isSandstorm && Meteor.isServer) {
const parsedDescriptor = Capnp.parse(
Powerbox.PowerboxDescriptor,
new Buffer(descriptor, 'base64'),
{ packed: true });
{ packed: true },
);
const tag = Capnp.parse(Identity.Identity.PowerboxTag, parsedDescriptor.tags[0].value);
const tag = Capnp.parse(
Identity.Identity.PowerboxTag,
parsedDescriptor.tags[0].value,
);
const permissions = [];
if (tag.permissions[1]) {
permissions.push('configure');
@ -71,15 +77,20 @@ if (isSandstorm && Meteor.isServer) {
const session = httpBridge.getSessionContext(sessionId).context;
const api = httpBridge.getSandstormApi(sessionId).api;
Meteor.wrapAsync((done) => {
session.claimRequest(token).then((response) => {
Meteor.wrapAsync(done => {
session
.claimRequest(token)
.then(response => {
const identity = response.cap.castAs(Identity.Identity);
const promises = [api.getIdentityId(identity), identity.getProfile(),
httpBridge.saveIdentity(identity)];
return Promise.all(promises).then((responses) => {
const promises = [
api.getIdentityId(identity),
identity.getProfile(),
httpBridge.saveIdentity(identity),
];
return Promise.all(promises).then(responses => {
const identityId = responses[0].id.toString('hex').slice(0, 32);
const profile = responses[1].profile;
return profile.picture.getUrl().then((response) => {
return profile.picture.getUrl().then(response => {
const sandstormInfo = {
id: identityId,
name: profile.displayName.defaultText,
@ -90,14 +101,17 @@ if (isSandstorm && Meteor.isServer) {
};
const login = Accounts.updateOrCreateUserFromExternalService(
'sandstorm', sandstormInfo,
{ profile: { name: sandstormInfo.name } });
'sandstorm',
sandstormInfo,
{ profile: { name: sandstormInfo.name } },
);
updateUserPermissions(login.userId, permissions);
done();
});
});
}).catch((e) => {
})
.catch(e => {
done(e, null);
});
})();
@ -107,32 +121,39 @@ if (isSandstorm && Meteor.isServer) {
function reportActivity(sessionId, path, type, users, caption) {
const httpBridge = getHttpBridge();
const session = httpBridge.getSessionContext(sessionId).context;
Meteor.wrapAsync((done) => {
return Promise.all(users.map((user) => {
return httpBridge.getSavedIdentity(user.id).then((response) => {
Meteor.wrapAsync(done => {
return Promise.all(
users.map(user => {
return httpBridge
.getSavedIdentity(user.id)
.then(response => {
// Call getProfile() to make sure that the identity successfully resolves.
// (In C++ we would instead call whenResolved() here.)
const identity = response.identity;
return identity.getProfile().then(() => {
return { identity,
return {
identity,
mentioned: !!user.mentioned,
subscribed: !!user.subscribed,
};
});
}).catch(() => {
})
.catch(() => {
// Ignore identities that fail to restore. Either they were added before we set
// `saveIdentityCaps` to true, or they have lost access to the board.
});
})).then((maybeUsers) => {
const users = maybeUsers.filter((u) => !!u);
}),
)
.then(maybeUsers => {
const users = maybeUsers.filter(u => !!u);
const event = { path, type, users };
if (caption) {
event.notification = { caption };
}
return session.activity(event);
}).then(() => done(),
(e) => done(e));
})
.then(() => done(), e => done(e));
})();
}
@ -146,7 +167,9 @@ if (isSandstorm && Meteor.isServer) {
const eventTypes = bridgeConfig.viewInfo.eventTypes;
const defIdx = eventTypes.findIndex((def) => def.name === doc.activityType );
const defIdx = eventTypes.findIndex(
def => def.name === doc.activityType,
);
if (defIdx >= 0) {
const users = {};
function ensureUserListed(userId) {
@ -188,10 +211,14 @@ if (isSandstorm && Meteor.isServer) {
if (doc.activityType === 'addComment') {
const comment = CardComments.findOne(doc.commentId);
caption = { defaultText: comment.text };
const activeMembers =
_.pluck(Boards.findOne(sandstormBoard._id).activeMembers(), 'userId');
(comment.text.match(/\B@([\w.]*)/g) || []).forEach((username) => {
const user = Meteor.users.findOne({ username: username.slice(1)});
const activeMembers = _.pluck(
Boards.findOne(sandstormBoard._id).activeMembers(),
'userId',
);
(comment.text.match(/\B@([\w.]*)/g) || []).forEach(username => {
const user = Meteor.users.findOne({
username: username.slice(1),
});
if (user && activeMembers.indexOf(user._id) !== -1) {
mentionedUser(user._id);
}
@ -209,7 +236,13 @@ if (isSandstorm && Meteor.isServer) {
const isAdmin = permissions.indexOf('configure') > -1;
const isCommentOnly = false;
const isNoComments = false;
const permissionDoc = { userId, isActive, isAdmin, isNoComments, isCommentOnly };
const permissionDoc = {
userId,
isActive,
isAdmin,
isNoComments,
isCommentOnly,
};
const boardMembers = Boards.findOne(sandstormBoard._id).members;
const memberIndex = _.pluck(boardMembers, 'userId').indexOf(userId);
@ -217,10 +250,8 @@ if (isSandstorm && Meteor.isServer) {
let modifier;
if (memberIndex > -1)
modifier = { $set: { [`members.${memberIndex}`]: permissionDoc } };
else if (!isActive)
modifier = {};
else
modifier = { $push: { members: permissionDoc }};
else if (!isActive) modifier = {};
else modifier = { $push: { members: permissionDoc } };
Boards.update(sandstormBoard._id, modifier);
}
@ -259,7 +290,7 @@ if (isSandstorm && Meteor.isServer) {
});
Activities.update(
{ activityTypeId: sandstormBoard._id },
{ $set: { userId: doc._id }}
{ $set: { userId: doc._id } },
);
}
@ -274,10 +305,12 @@ if (isSandstorm && Meteor.isServer) {
const username = doc.services.sandstorm.preferredHandle;
let appendNumber = 0;
while (Users.findOne({
while (
Users.findOne({
_id: { $ne: doc._id },
username: generateUniqueUsername(username, appendNumber),
})) {
})
) {
appendNumber += 1;
}
@ -327,34 +360,37 @@ if (isSandstorm && Meteor.isServer) {
// Monkey patch to work around the problem described in
// https://github.com/sandstorm-io/meteor-accounts-sandstorm/pull/31
const _httpMethods = HTTP.methods;
HTTP.methods = (newMethods) => {
Object.keys(newMethods).forEach((key) => {
HTTP.methods = newMethods => {
Object.keys(newMethods).forEach(key => {
if (newMethods[key].auth) {
newMethods[key].auth = function() {
const sandstormID = this.req.headers['x-sandstorm-user-id'];
const user = Meteor.users.findOne({'services.sandstorm.id': sandstormID});
const user = Meteor.users.findOne({
'services.sandstorm.id': sandstormID,
});
return user && user._id;
};
}
});
_httpMethods(newMethods);
};
}
if (isSandstorm && Meteor.isClient) {
let rpcCounter = 0;
const rpcs = {};
window.addEventListener('message', (event) => {
window.addEventListener('message', event => {
if (event.source === window) {
// Meteor likes to postmessage itself.
return;
}
if ((event.source !== window.parent) ||
if (
event.source !== window.parent ||
typeof event.data !== 'object' ||
typeof event.data.rpcId !== 'number') {
typeof event.data.rpcId !== 'number'
) {
throw new Error(`got unexpected postMessage: ${event}`);
}
@ -374,7 +410,7 @@ if (isSandstorm && Meteor.isClient) {
obj[name] = message;
window.parent.postMessage(obj, '*');
return new Promise((resolve, reject) => {
rpcs[id] = (response) => {
rpcs[id] = response => {
if (response.error) {
reject(new Error(response.error));
} else {
@ -401,7 +437,7 @@ if (isSandstorm && Meteor.isClient) {
function doRequest(serializedPowerboxDescriptor, onSuccess) {
return sendRpc('powerboxRequest', {
query: [serializedPowerboxDescriptor],
}).then((response) => {
}).then(response => {
if (!response.canceled) {
onSuccess(response);
}
@ -409,8 +445,12 @@ if (isSandstorm && Meteor.isClient) {
}
window.sandstormRequestIdentity = function() {
doRequest(powerboxDescriptors.identity, (response) => {
Meteor.call('sandstormClaimIdentityRequest', response.token, response.descriptor);
doRequest(powerboxDescriptors.identity, response => {
Meteor.call(
'sandstormClaimIdentityRequest',
response.token,
response.descriptor,
);
});
};
@ -422,9 +462,11 @@ if (isSandstorm && Meteor.isClient) {
return window.parent.postMessage(msg, '*');
}
FlowRouter.triggers.enter([({ path }) => {
FlowRouter.triggers.enter([
({ path }) => {
updateSandstormMetaData({ setPath: path });
}]);
},
]);
Tracker.autorun(() => {
updateSandstormMetaData({ setTitle: DocHead.getTitle() });

19
server/accounts-lockout.js
View file

@ -2,15 +2,20 @@
// server
import { AccountsLockout } from 'meteor/lucasantoniassi:accounts-lockout';
(new AccountsLockout({
new AccountsLockout({
knownUsers: {
failuresBeforeLockout: process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE || 3,
failuresBeforeLockout:
process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE || 3,
lockoutPeriod: process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD || 60,
failureWindow: process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW || 15,
failureWindow:
process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW || 15,
},
unknownUsers: {
failuresBeforeLockout: process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE || 3,
lockoutPeriod: process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD || 60,
failureWindow: process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW || 15,
failuresBeforeLockout:
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE || 3,
lockoutPeriod:
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD || 60,
failureWindow:
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW || 15,
},
})).startup();
}).startup();

17
server/authentication.js
View file

@ -1,7 +1,6 @@
import Fiber from 'fibers';
Meteor.startup(() => {
// Node Fibers 100% CPU usage issue
// https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
// https://github.com/meteor/meteor/issues/9796#issuecomment-381676326
@ -28,7 +27,6 @@ Meteor.startup(() => {
error.statusCode = 403;
throw error;
}
};
// This will only check if the user is logged in.
@ -58,14 +56,16 @@ Meteor.startup(() => {
Authentication.checkLoggedIn(userId);
const board = Boards.findOne({ _id: boardId });
const normalAccess = board.permission === 'public' || board.members.some((e) => e.userId === userId);
const normalAccess =
board.permission === 'public' ||
board.members.some(e => e.userId === userId);
Authentication.checkAdminOrCondition(userId, normalAccess);
};
if (Meteor.isServer) {
if (process.env.OAUTH2_CLIENT_ID !== '') {
ServiceConfiguration.configurations.upsert( // eslint-disable-line no-undef
ServiceConfiguration.configurations.upsert(
// eslint-disable-line no-undef
{ service: 'oidc' },
{
$set: {
@ -76,15 +76,14 @@ Meteor.startup(() => {
authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
idTokenWhitelistFields:
process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS,
},
// OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
// OAUTH2_REQUEST_PERMISSIONS || 'openid profile email',
}
},
);
}
}
});

12
server/cors.js
View file

@ -1,5 +1,4 @@
Meteor.startup(() => {
if (process.env.CORS) {
// Listen to incoming HTTP requests, can only be used on the server
WebApp.rawConnectHandlers.use(function(req, res, next) {
@ -9,15 +8,20 @@ Meteor.startup(() => {
}
if (process.env.CORS_ALLOW_HEADERS) {
WebApp.rawConnectHandlers.use(function(req, res, next) {
res.setHeader('Access-Control-Allow-Headers', process.env.CORS_ALLOW_HEADERS);
res.setHeader(
'Access-Control-Allow-Headers',
process.env.CORS_ALLOW_HEADERS,
);
return next();
});
}
if (process.env.CORS_EXPOSE_HEADERS) {
WebApp.rawConnectHandlers.use(function(req, res, next) {
res.setHeader('Access-Control-Expose-Headers', process.env.CORS_EXPOSE_HEADERS);
res.setHeader(
'Access-Control-Expose-Headers',
process.env.CORS_EXPOSE_HEADERS,
);
return next();
});
}
});

8
server/header-login.js
View file

@ -1,10 +1,10 @@
Meteor.startup(() => {
if (process.env.HEADER_LOGIN_ID) {
Meteor.settings.public.headerLoginId = process.env.HEADER_LOGIN_ID;
Meteor.settings.public.headerLoginEmail = process.env.HEADER_LOGIN_EMAIL;
Meteor.settings.public.headerLoginFirstname = process.env.HEADER_LOGIN_FIRSTNAME;
Meteor.settings.public.headerLoginLastname = process.env.HEADER_LOGIN_LASTNAME;
Meteor.settings.public.headerLoginFirstname =
process.env.HEADER_LOGIN_FIRSTNAME;
Meteor.settings.public.headerLoginLastname =
process.env.HEADER_LOGIN_LASTNAME;
}
});

2
server/lib/utils.js
View file

@ -7,7 +7,7 @@ allowIsBoardMember = function(userId, board) {
};
allowIsAnyBoardMember = function(userId, boards) {
return _.some(boards, (board) => {
return _.some(boards, board => {
return board && board.hasMember(userId);
});
};

129
server/migrations.js
View file

@ -62,16 +62,16 @@ Migrations.add('board-background-color', () => {
},
},
},
noValidateMulti
noValidateMulti,
);
});
Migrations.add('lowercase-board-permission', () => {
['Public', 'Private'].forEach((permission) => {
['Public', 'Private'].forEach(permission => {
Boards.update(
{ permission },
{ $set: { permission: permission.toLowerCase() } },
noValidateMulti
noValidateMulti,
);
});
});
@ -79,7 +79,7 @@ Migrations.add('lowercase-board-permission', () => {
// Security migration: see https://github.com/wekan/wekan/issues/99
Migrations.add('change-attachments-type-for-non-images', () => {
const newTypeForNonImage = 'application/octet-stream';
Attachments.find().forEach((file) => {
Attachments.find().forEach(file => {
if (!file.isImage()) {
Attachments.update(
file._id,
@ -89,14 +89,14 @@ Migrations.add('change-attachments-type-for-non-images', () => {
'copies.attachments.type': newTypeForNonImage,
},
},
noValidate
noValidate,
);
}
});
});
Migrations.add('card-covers', () => {
Cards.find().forEach((card) => {
Cards.find().forEach(card => {
const cover = Attachments.findOne({ cardId: card._id, cover: true });
if (cover) {
Cards.update(card._id, { $set: { coverId: cover._id } }, noValidate);
@ -114,7 +114,7 @@ Migrations.add('use-css-class-for-boards-colors', () => {
'#2C3E50': 'midnight',
'#E67E22': 'pumpkin',
};
Boards.find().forEach((board) => {
Boards.find().forEach(board => {
const oldBoardColor = board.background.color;
const newBoardColor = associationTable[oldBoardColor];
Boards.update(
@ -123,13 +123,13 @@ Migrations.add('use-css-class-for-boards-colors', () => {
$set: { color: newBoardColor },
$unset: { background: '' },
},
noValidate
noValidate,
);
});
});
Migrations.add('denormalize-star-number-per-board', () => {
Boards.find().forEach((board) => {
Boards.find().forEach(board => {
const nStars = Users.find({ 'profile.starredBoards': board._id }).count();
Boards.update(board._id, { $set: { stars: nStars } }, noValidate);
});
@ -138,9 +138,12 @@ Migrations.add('denormalize-star-number-per-board', () => {
// We want to keep a trace of former members so we can efficiently publish their
// infos in the general board publication.
Migrations.add('add-member-isactive-field', () => {
Boards.find({}, { fields: { members: 1 } }).forEach((board) => {
Boards.find({}, { fields: { members: 1 } }).forEach(board => {
const allUsersWithSomeActivity = _.chain(
Activities.find({ boardId: board._id }, { fields: { userId: 1 } }).fetch()
Activities.find(
{ boardId: board._id },
{ fields: { userId: 1 } },
).fetch(),
)
.pluck('userId')
.uniq()
@ -149,11 +152,11 @@ Migrations.add('add-member-isactive-field', () => {
const formerUsers = _.difference(allUsersWithSomeActivity, currentUsers);
const newMemberSet = [];
board.members.forEach((member) => {
board.members.forEach(member => {
member.isActive = true;
newMemberSet.push(member);
});
formerUsers.forEach((userId) => {
formerUsers.forEach(userId => {
newMemberSet.push({
userId,
isAdmin: false,
@ -170,7 +173,7 @@ Migrations.add('add-sort-checklists', () => {
Checklists.direct.update(
checklist._id,
{ $set: { sort: index } },
noValidate
noValidate,
);
}
checklist.items.forEach((item, index) => {
@ -178,7 +181,7 @@ Migrations.add('add-sort-checklists', () => {
Checklists.direct.update(
{ _id: checklist._id, 'items._id': item._id },
{ $set: { 'items.$.sort': index } },
noValidate
noValidate,
);
}
});
@ -186,14 +189,14 @@ Migrations.add('add-sort-checklists', () => {
});
Migrations.add('add-swimlanes', () => {
Boards.find().forEach((board) => {
Boards.find().forEach(board => {
const swimlaneId = board.getDefaultSwimline()._id;
Cards.find({ boardId: board._id }).forEach((card) => {
Cards.find({ boardId: board._id }).forEach(card => {
if (!card.hasOwnProperty('swimlaneId')) {
Cards.direct.update(
{ _id: card._id },
{ $set: { swimlaneId } },
noValidate
noValidate,
);
}
});
@ -201,19 +204,19 @@ Migrations.add('add-swimlanes', () => {
});
Migrations.add('add-views', () => {
Boards.find().forEach((board) => {
Boards.find().forEach(board => {
if (!board.hasOwnProperty('view')) {
Boards.direct.update(
{ _id: board._id },
{ $set: { view: 'board-view-swimlanes' } },
noValidate
noValidate,
);
}
});
});
Migrations.add('add-checklist-items', () => {
Checklists.find().forEach((checklist) => {
Checklists.find().forEach(checklist => {
// Create new items
_.sortBy(checklist.items, 'sort').forEach((item, index) => {
ChecklistItems.direct.insert({
@ -229,26 +232,26 @@ Migrations.add('add-checklist-items', () => {
Checklists.direct.update(
{ _id: checklist._id },
{ $unset: { items: 1 } },
noValidate
noValidate,
);
});
});
Migrations.add('add-profile-view', () => {
Users.find().forEach((user) => {
Users.find().forEach(user => {
if (!user.hasOwnProperty('profile.boardView')) {
// Set default view
Users.direct.update(
{ _id: user._id },
{ $set: { 'profile.boardView': 'board-view-lists' } },
noValidate
noValidate,
);
}
});
});
Migrations.add('add-card-types', () => {
Cards.find().forEach((card) => {
Cards.find().forEach(card => {
Cards.direct.update(
{ _id: card._id },
{
@ -257,7 +260,7 @@ Migrations.add('add-card-types', () => {
linkedId: null,
},
},
noValidate
noValidate,
);
});
});
@ -274,7 +277,7 @@ Migrations.add('add-custom-fields-to-cards', () => {
customFields: [],
},
},
noValidateMulti
noValidateMulti,
);
});
@ -290,7 +293,7 @@ Migrations.add('add-requester-field', () => {
requestedBy: '',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -306,7 +309,7 @@ Migrations.add('add-assigner-field', () => {
assignedBy: '',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -322,7 +325,7 @@ Migrations.add('add-parent-field-to-cards', () => {
parentId: '',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -339,7 +342,7 @@ Migrations.add('add-subtasks-boards', () => {
subtasksDefaultListId: null,
},
},
noValidateMulti
noValidateMulti,
);
});
@ -355,7 +358,7 @@ Migrations.add('add-subtasks-sort', () => {
subtaskSort: -1,
},
},
noValidateMulti
noValidateMulti,
);
});
@ -371,7 +374,7 @@ Migrations.add('add-subtasks-allowed', () => {
allowsSubtasks: true,
},
},
noValidateMulti
noValidateMulti,
);
});
@ -387,7 +390,7 @@ Migrations.add('add-subtasks-allowed', () => {
presentParentTask: 'no-parent',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -403,7 +406,7 @@ Migrations.add('add-authenticationMethod', () => {
authenticationMethod: 'password',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -415,7 +418,7 @@ Migrations.add('remove-tag', () => {
'profile.tags': 1,
},
},
noValidateMulti
noValidateMulti,
);
});
@ -427,7 +430,7 @@ Migrations.add('remove-customFields-references-broken', () => {
customFields: { value: null },
},
},
noValidateMulti
noValidateMulti,
);
});
@ -443,7 +446,7 @@ Migrations.add('add-product-name', () => {
productName: '',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -459,7 +462,7 @@ Migrations.add('add-hide-logo', () => {
hideLogo: false,
},
},
noValidateMulti
noValidateMulti,
);
});
@ -475,7 +478,7 @@ Migrations.add('add-custom-html-after-body-start', () => {
customHTMLafterBodyStart: '',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -491,7 +494,7 @@ Migrations.add('add-custom-html-before-body-end', () => {
customHTMLbeforeBodyEnd: '',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -507,7 +510,7 @@ Migrations.add('add-displayAuthenticationMethod', () => {
displayAuthenticationMethod: true,
},
},
noValidateMulti
noValidateMulti,
);
});
@ -523,7 +526,7 @@ Migrations.add('add-defaultAuthenticationMethod', () => {
defaultAuthenticationMethod: 'password',
},
},
noValidateMulti
noValidateMulti,
);
});
@ -539,7 +542,7 @@ Migrations.add('add-templates', () => {
type: 'board',
},
},
noValidateMulti
noValidateMulti,
);
Swimlanes.update(
{
@ -552,7 +555,7 @@ Migrations.add('add-templates', () => {
type: 'swimlane',
},
},
noValidateMulti
noValidateMulti,
);
Lists.update(
{
@ -569,13 +572,13 @@ Migrations.add('add-templates', () => {
swimlaneId: '',
},
},
noValidateMulti
noValidateMulti,
);
Users.find({
'profile.templatesBoardId': {
$exists: false,
},
}).forEach((user) => {
}).forEach(user => {
// Create board and swimlanes
Boards.insert(
{
@ -611,7 +614,7 @@ Migrations.add('add-templates', () => {
Users.update(user._id, {
$set: { 'profile.cardTemplatesSwimlaneId': swimlaneId },
});
}
},
);
// Insert the list templates swimlane
@ -627,7 +630,7 @@ Migrations.add('add-templates', () => {
Users.update(user._id, {
$set: { 'profile.listTemplatesSwimlaneId': swimlaneId },
});
}
},
);
// Insert the board templates swimlane
@ -643,15 +646,15 @@ Migrations.add('add-templates', () => {
Users.update(user._id, {
$set: { 'profile.boardTemplatesSwimlaneId': swimlaneId },
});
}
},
);
}
},
);
});
});
Migrations.add('fix-circular-reference_', () => {
Cards.find().forEach((card) => {
Cards.find().forEach(card => {
if (card.parentId === card._id) {
Cards.update(card._id, { $set: { parentId: '' } }, noValidateMulti);
}
@ -659,7 +662,7 @@ Migrations.add('fix-circular-reference_', () => {
});
Migrations.add('mutate-boardIds-in-customfields', () => {
CustomFields.find().forEach((cf) => {
CustomFields.find().forEach(cf => {
CustomFields.update(
cf,
{
@ -670,7 +673,7 @@ Migrations.add('mutate-boardIds-in-customfields', () => {
boardId: '',
},
},
noValidateMulti
noValidateMulti,
);
});
});
@ -696,13 +699,13 @@ const firstBatchOfDbsToAddCreatedAndUpdated = [
UnsavedEdits,
];
firstBatchOfDbsToAddCreatedAndUpdated.forEach((db) => {
firstBatchOfDbsToAddCreatedAndUpdated.forEach(db => {
db.before.insert((userId, doc) => {
doc.createdAt = Date.now();
doc.updatedAt = doc.createdAt;
});
db.before.update((userId, doc, fieldNames, modifier, options) => {
db.before.update((userId, doc, fieldNames, modifier) => {
modifier.$set = modifier.$set || {};
modifier.$set.updatedAt = new Date();
});
@ -732,13 +735,13 @@ const modifiedAtTables = [
Migrations.add('add-missing-created-and-modified', () => {
Promise.all(
modifiedAtTables.map((db) =>
modifiedAtTables.map(db =>
db
.rawCollection()
.update(
{ modifiedAt: { $exists: false } },
{ $set: { modifiedAt: new Date() } },
{ multi: true }
{ multi: true },
)
.then(() =>
db
@ -746,16 +749,16 @@ Migrations.add('add-missing-created-and-modified', () => {
.update(
{ createdAt: { $exists: false } },
{ $set: { createdAt: new Date() } },
{ multi: true }
)
)
)
{ multi: true },
),
),
),
)
.then(() => {
// eslint-disable-next-line no-console
console.info('Successfully added createdAt and updatedAt to all tables');
})
.catch((e) => {
.catch(e => {
// eslint-disable-next-line no-console
console.error(e);
});

10
server/notifications/email.js
View file

@ -3,11 +3,15 @@ Meteor.startup(() => {
Notifications.subscribe('email', (user, title, description, params) => {
// add quote to make titles easier to read in email text
const quoteParams = _.clone(params);
['card', 'list', 'oldList', 'board', 'comment'].forEach((key) => {
['card', 'list', 'oldList', 'board', 'comment'].forEach(key => {
if (quoteParams[key]) quoteParams[key] = `"${params[key]}"`;
});
const text = `${params.user} ${TAPi18n.__(description, quoteParams, user.getLanguage())}\n${params.url}`;
const text = `${params.user} ${TAPi18n.__(
description,
quoteParams,
user.getLanguage(),
)}\n${params.url}`;
user.addEmailBuffer(text);
// unlike setTimeout(func, delay, args),
@ -39,5 +43,3 @@ Meteor.startup(() => {
}, process.env.EMAIL_NOTIFICATION_TIMEOUT || 30000);
});
});

9
server/notifications/notifications.js
View file

@ -14,14 +14,14 @@ Notifications = {
notifyServices[serviceName] = callback;
},
unsubscribe: (serviceName) => {
unsubscribe: serviceName => {
if (typeof notifyServices[serviceName] === 'function')
delete notifyServices[serviceName];
},
getUsers: (watchers) => {
getUsers: watchers => {
const users = [];
watchers.forEach((userId) => {
watchers.forEach(userId => {
const user = Users.findOne(userId);
if (user) users.push(user);
});
@ -31,7 +31,8 @@ Notifications = {
notify: (user, title, description, params) => {
for (const k in notifyServices) {
const notifyImpl = notifyServices[k];
if (notifyImpl && typeof notifyImpl === 'function') notifyImpl(user, title, description, params);
if (notifyImpl && typeof notifyImpl === 'function')
notifyImpl(user, title, description, params);
}
},
};

Some files were not shown because too many files have changed in this diff Show more