diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-06-29 07:47:57 -0400 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-06-29 07:47:57 -0400 |
commit | b84dc20ded0375d9ab14ec05c78b737398d76b83 (patch) | |
tree | c3b91b3657299c779e941a1257df17bb0eade866 /client/components/import | |
parent | 100288b3e1bce882ab9923a5bff7b5f620f33ee8 (diff) | |
parent | 3eb4d2c341b712268bd321173909e0a7b19a88c9 (diff) | |
download | wekan-b84dc20ded0375d9ab14ec05c78b737398d76b83.tar.gz wekan-b84dc20ded0375d9ab14ec05c78b737398d76b83.tar.bz2 wekan-b84dc20ded0375d9ab14ec05c78b737398d76b83.zip |
Merge branch 'linting' of https://github.com/justinr1234/wekan into justinr1234-linting
Diffstat (limited to 'client/components/import')
-rw-r--r-- | client/components/import/import.js | 85 | ||||
-rw-r--r-- | client/components/import/trelloMembersMapper.js | 2 | ||||
-rw-r--r-- | client/components/import/wekanMembersMapper.js | 4 |
3 files changed, 50 insertions, 41 deletions
diff --git a/client/components/import/import.js b/client/components/import/import.js index 64170c1d..62c7e525 100644 --- a/client/components/import/import.js +++ b/client/components/import/import.js @@ -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); } - } + }, ); }, @@ -84,12 +85,12 @@ BlazeComponent.extendComponent({ const importSource = Session.get('importSource'); let membersToMap; switch (importSource) { - case 'trello': - membersToMap = trelloMembersMapper.getMembersToMap(dataObject); - break; - case 'wekan': - membersToMap = wekanMembersMapper.getMembersToMap(dataObject); - break; + case 'trello': + membersToMap = trelloMembersMapper.getMembersToMap(dataObject); + break; + case 'wekan': + membersToMap = wekanMembersMapper.getMembersToMap(dataObject); + break; } return membersToMap; }, @@ -109,22 +110,26 @@ BlazeComponent.extendComponent({ }, events() { - return [{ - submit(evt) { - return this.parentComponent().importData(evt); + return [ + { + submit(evt) { + return this.parentComponent().importData(evt); + }, }, - }]; + ]; }, }).register('importTextarea'); BlazeComponent.extendComponent({ onCreated() { this.autorun(() => { - this.parentComponent().membersToMap.get().forEach(({ wekanId }) => { - if (wekanId) { - this.subscribe('user-miniprofile', wekanId); - } - }); + this.parentComponent() + .membersToMap.get() + .forEach(({ wekanId }) => { + if (wekanId) { + this.subscribe('user-miniprofile', wekanId); + } + }); }); }, @@ -149,23 +154,23 @@ BlazeComponent.extendComponent({ _setPropertyForMember(property, value, memberId, unset = false) { const listOfMembers = this.members(); let finder = null; - if(memberId) { - finder = (member) => member.id === memberId; + if (memberId) { + finder = member => member.id === memberId; } else { - finder = (member) => member.selected; + finder = member => member.selected; } - listOfMembers.forEach((member) => { - if(finder(member)) { - if(value !== null) { + listOfMembers.forEach(member => { + if (finder(member)) { + if (value !== null) { member[property] = value; } else { delete member[property]; } - if(!unset) { + if (!unset) { // we shortcut if we don't care about unsetting the others return false; } - } else if(unset) { + } else if (unset) { delete member[property]; } return true; @@ -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); }, @@ -197,7 +202,7 @@ BlazeComponent.extendComponent({ return this._setPropertyForMember('wekanId', wekanId, null); }, - unmapMember(memberId){ + unmapMember(memberId) { return this._setPropertyForMember('wekanId', null, memberId); }, @@ -208,7 +213,7 @@ BlazeComponent.extendComponent({ onMapMember(evt) { const memberToMap = this.currentData(); - if(memberToMap.wekan) { + if (memberToMap.wekan) { // todo xxx ask for confirmation? this.unmapMember(memberToMap.id); } else { @@ -218,10 +223,12 @@ BlazeComponent.extendComponent({ }, events() { - return [{ - 'submit': this.onSubmit, - 'click .js-select-member': this.onMapMember, - }]; + return [ + { + submit: this.onSubmit, + 'click .js-select-member': this.onMapMember, + }, + ]; }, }).register('importMapMembers'); @@ -230,14 +237,16 @@ BlazeComponent.extendComponent({ this.find('.js-map-member input').focus(); }, - onSelectUser(){ + onSelectUser() { Popup.getOpenerComponent().mapSelectedMember(this.currentData()._id); Popup.back(); }, events() { - return [{ - 'click .js-select-import': this.onSelectUser, - }]; + return [ + { + 'click .js-select-import': this.onSelectUser, + }, + ]; }, }).register('importMapMembersAddPopup'); diff --git a/client/components/import/trelloMembersMapper.js b/client/components/import/trelloMembersMapper.js index 0f353bf1..b5d59d93 100644 --- a/client/components/import/trelloMembersMapper.js +++ b/client/components/import/trelloMembersMapper.js @@ -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; diff --git a/client/components/import/wekanMembersMapper.js b/client/components/import/wekanMembersMapper.js index f4c110f7..8db3aacd 100644 --- a/client/components/import/wekanMembersMapper.js +++ b/client/components/import/wekanMembersMapper.js @@ -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) { |