|
|
@@ -11,60 +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);
|
|
|
- this.setError('');
|
|
|
- } 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;
|
|
|
}
|
|
|
- if(dataObject.members.length > 0) {
|
|
|
- this.data().toImport = dataObject;
|
|
|
- members.forEach(
|
|
|
- // todo if there is a Wekan user with same name, add it as a field 'wekanUser'
|
|
|
- );
|
|
|
- this.data().members = dataObject.members;
|
|
|
- // we bind to preserve data context
|
|
|
- Popup.open('mapMembers').bind(this)(evt);
|
|
|
- } else {
|
|
|
- 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('');
|
|
|
- this.dataToImport = '';
|
|
|
+ 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;
|
|
|
@@ -100,13 +116,119 @@ ImportPopup.extendComponent({
|
|
|
},
|
|
|
}).register('boardImportBoardPopup');
|
|
|
|
|
|
-BlazeComponent.extendComponent({
|
|
|
+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': (evt) => {
|
|
|
- evt.preventDefault();
|
|
|
- console.log(this.data());
|
|
|
- },
|
|
|
+ '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');
|
Xavier Priour