diff options
| -rw-r--r-- | .meteor/release | 2 | ||||
| -rw-r--r-- | .meteor/versions | 6 | ||||
| -rw-r--r-- | client/components/import/import.jade | 41 | ||||
| -rw-r--r-- | client/components/import/import.js | 200 | ||||
| -rw-r--r-- | client/components/import/import.styl | 13 | ||||
| -rw-r--r-- | i18n/en.i18n.json | 3 | ||||
| -rw-r--r-- | models/users.js | 2 |
7 files changed, 234 insertions, 33 deletions
diff --git a/.meteor/release b/.meteor/release index 3a05e0a2..1090f581 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.2.1 +METEOR@1.2.2-cdn-url diff --git a/.meteor/versions b/.meteor/versions index 5c4c189b..e5de3720 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -13,7 +13,7 @@ base64@1.0.4 binary-heap@1.0.4 blaze@2.1.3 blaze-tools@1.0.4 -boilerplate-generator@1.0.4 +boilerplate-generator@1.0.5-cdn-url caching-compiler@1.0.0 caching-html-compiler@1.0.2 callback-hook@1.0.4 @@ -63,7 +63,7 @@ idmontie:migrations@1.0.1 jquery@1.11.4 kadira:blaze-layout@2.2.0 kadira:dochead@1.3.2 -kadira:flow-router@2.8.0 +kadira:flow-router@2.9.0 kenton:accounts-sandstorm@0.1.8 launch-screen@1.0.4 livedata@1.0.15 @@ -141,6 +141,6 @@ useraccounts:core@1.12.4 useraccounts:flow-routing@1.12.4 useraccounts:unstyled@1.12.4 verron:autosize@3.0.8 -webapp@1.2.3 +webapp@1.2.4-cdn-url webapp-hashing@1.0.5 zimme:active-route@2.3.2 diff --git a/client/components/import/import.jade b/client/components/import/import.jade index f63661af..07e1116b 100644 --- a/client/components/import/import.jade +++ b/client/components/import/import.jade @@ -5,3 +5,44 @@ template(name="importPopup") p: label(for='import-textarea') {{_ getLabel}} textarea#import-textarea.js-import-json(placeholder="{{_ 'import-json-placeholder'}}" autofocus) input.primary.wide(type="submit" value="{{_ 'import'}}") + +template(name="mapMembersPopup") + .map-members + p {{_ 'import-members-map'}} + .mapping-list + each members + .mapping + a.source + div.full-name + = fullName + div.username + | ({{username}}) + .wekan + if wekan + +userAvatar(userId=wekan._id) + else + a.member.add-member.js-add-members + i.fa.fa-plus + form + input.primary.wide(type="submit" value="{{_ 'import'}}") + + template(name="addMemberPopup") + +template(name="mapMembersAddPopup") + .select-member + p Hello world + .js-map-member + +esInput(index="users") + ul.pop-over-list + +esEach(index="users") + li.item.js-member-item + a.name.js-select-member(title="{{profile.name}} ({{username}})" data-id="{{_id}}") + +userAvatar(userId=_id esSearch=true) + span.full-name + = profile.name + | (<span class="username">{{username}}</span>) + +ifEsIsSearching(index='users') + +spinner + +ifEsHasNoResults(index="users") + .manage-member-section + p.quiet {{_ 'no-results'}} diff --git a/client/components/import/import.js b/client/components/import/import.js index c6957fa9..3682afdb 100644 --- a/client/components/import/import.js +++ b/client/components/import/import.js @@ -11,48 +11,76 @@ const ImportPopup = BlazeComponent.extendComponent({ return 'importPopup'; }, - events() { - return [{ - 'submit': (evt) => { - evt.preventDefault(); - const dataJson = $(evt.currentTarget).find('.js-import-json').val(); - let dataObject; - try { - dataObject = JSON.parse(dataJson); - } catch (e) { - this.setError('error-json-malformed'); - return; + onCreated() { + this.error = new ReactiveVar(''); + this.dataToImport = ''; + }, + + onFinish() { + Popup.close(); + }, + + onSubmit(evt){ + evt.preventDefault(); + const dataJson = $(evt.currentTarget).find('.js-import-json').val(); + let dataObject; + try { + dataObject = JSON.parse(dataJson); + this.setError(''); + } catch (e) { + this.setError('error-json-malformed'); + return; + } + // if there are members listed in the import, we need to map them + if(dataObject.members.length > 0) { + // we will work on the list itself (an ordered array of POJO) + // when a mapping is done, we add a 'wekan' field to the POJO representing the imported member + const membersToMap = dataObject.members; + // todo save initial import object - to save later, on mapping submission + // this.data().toImport = dataObject; + + // auto-map based on username + const wekanMembers = Users; + membersToMap.forEach((importedMember) => { + const wekanUser = Users.findOne({username: importedMember.username}) + if(wekanUser) { + importedMember.wekan = wekanUser; } - Meteor.call(this.getMethodName(), dataObject, this.getAdditionalData(), - (error, response) => { - if (error) { - this.setError(error.error); - } else { - Filter.addException(response); - this.onFinish(response); - } + }); + // store members data and mapping in Session + // (we go deep and 2-way, so storing in data context is not a viable option) + Session.set('import.membersToMap', membersToMap); + Popup.open('mapMembers')(evt); + } else { + Meteor.call(this.getMethodName(), dataObject, this.getAdditionalData(), + (error, response) => { + if (error) { + this.setError(error.error); + } else { + // ensure will display what we just imported + Filter.addException(response); + this.onFinish(response); } - ); - }, - }]; + } + ); + } }, - onCreated() { - this.error = new ReactiveVar(''); + events() { + return [{ + submit: this.onSubmit, + }]; }, setError(error) { this.error.set(error); }, - onFinish() { - Popup.close(); - }, }); ImportPopup.extendComponent({ getAdditionalData() { - const listId = this.data()._id; + const listId = this.currentData()._id; const selector = `#js-list-${this.currentData()._id} .js-minicard:first`; const firstCardDom = $(selector).get(0); const sortIndex = Utils.calculateIndex(null, firstCardDom).base; @@ -88,3 +116,119 @@ ImportPopup.extendComponent({ }, }).register('boardImportBoardPopup'); +const ImportMapMembers = BlazeComponent.extendComponent({ + members() { + return Session.get('import.membersToMap'); + }, + _refreshMembers(listOfMembers) { + Session.set('import.membersToMap', listOfMembers); + }, + /** + * Will look into the list of members to import for the specified memberId, + * then set its property to the supplied value. + * If unset is true, it will remove the property from the rest of the list as well. + * + * use: + * - memberId = null to use selected member + * - value = null to unset a property + * - unset = true to ensure property is only set on 1 member at a time + */ + _setPropertyForMember(property, value, memberId, unset = false) { + const listOfMembers = this.members(); + let finder = null; + if(memberId) { + finder = (member) => member.id === memberId; + } else { + finder = (member) => member.selected; + } + listOfMembers.forEach((member) => { + if(finder(member)) { + if(value !== null) { + member[property] = true; + } else { + delete member[property]; + } + if(!unset) { + // we shortcut if we don't care about unsetting the others + return false; + } + } else { + if(unset) { + delete member[property]; + } + } + return true; + }); + // Session.get gives us a copy, we have to set it back so it sticks + this._refreshMembers(listOfMembers); + }, + setSelectedMember(memberId) { + return this._setPropertyForMember('selected', true, memberId, true); + }, + /** + * returns the member with specified id, + * or the selected member if memberId is not specified + */ + getMember(memberId = null) { + const allMembers = Session.get('import.membersToMap'); + let finder = null; + if(memberId) { + finder = (user) => user.id === memberId; + } else { + finder = (user) => user.selected; + } + return allMembers.find(finder); + }, + mapSelectedMember(wekan) { + return this._setPropertyForMember('wekan', wekan, null); + }, + unmapMember(memberId){ + return this._setPropertyForMember('wekan', null, memberId); + }, +}); + +ImportMapMembers.extendComponent({ + onSelectMember(evt) { + const memberToMap = this.currentData(); + this.setSelectedMember(memberToMap.id); + console.log(`selected member#${memberToMap.id}`); + Popup.open('mapMembersAdd')(evt); + }, + onRemove(evt){ + const userId = this.currentData()._id; + console.log(`confirm and then call unmapMember ${userId}`); + }, + onSubmit(evt) { + console.log("Mapping:"); + console.log(this.members()); + }, + events() { + return [{ + 'submit': this.onSubmit, + 'click .js-add-members': this.onSelectMember, + 'click .js-member': this.onRemove, + }]; + }, +}).register('mapMembersPopup'); + +ImportMapMembers.extendComponent({ + //template() { + // return "mapMembersAddPopup"; + //}, + onSelectUser(){ + const wekanUser = this.currentData(); + console.log(`clicked on ${wekanUser._id}`); + console.log(wekanUser); + //this.mapSelectedMember(this.currentData()); + }, + events() { + return [{ + //'click .js-select-member': this.onSelectUser(), + }]; + }, + onRendered() { + console.log('rendered'); + // todo XXX why do I not focus?? + $('.js-map-member input').focus(); + }, +}).register('mapMembersAddPopup'); diff --git a/client/components/import/import.styl b/client/components/import/import.styl new file mode 100644 index 00000000..4934cbcc --- /dev/null +++ b/client/components/import/import.styl @@ -0,0 +1,13 @@ +.map-members + .mapping + margin-bottom: 10px + margin-top: 10px + border-bottom: solid + .source + display: inline-block + width: 80% + .wekan + display: inline-block + width: 35px + .member + float: none diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 82fb4ccd..14cd9f24 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -141,6 +141,7 @@ "import-card": "Import a Trello card", "import-card-trello-instruction": "Go to a Trello card, select 'Share and more...' then 'Export JSON' and copy the resulting text", "import-json-placeholder": "Paste your valid JSON data here", + "import-members-map": "Map the Trello members you want to import to Wekan members", "info": "Infos", "initials": "Initials", "joined": "joined", @@ -164,6 +165,8 @@ "lists": "Lists", "log-out": "Log Out", "loginPopup-title": "Log In", + "mapMembersPopup-title": "Map members", + "mapMembersAddPopup-title": "Select Wekan member", "memberMenuPopup-title": "Member Settings", "members": "Members", "menu": "Menu", diff --git a/models/users.js b/models/users.js index 1e69564d..e85671bc 100644 --- a/models/users.js +++ b/models/users.js @@ -2,7 +2,7 @@ Users = Meteor.users; // eslint-disable-line meteor/collections // Search a user in the complete server database by its name or username. This // is used for instance to add a new user to a board. -const searchInFields = ['username', 'profile.name']; +const searchInFields = ['username', 'profile.fullname']; Users.initEasySearch(searchInFields, { use: 'mongo-db', returnFields: [...searchInFields, 'profile.avatarUrl'], |