-
Notifications
You must be signed in to change notification settings - Fork 10.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
rocketchat-channel-settings-mail-messages coffee to js #6541
Merged
engelgabriel
merged 2 commits into
RocketChat:develop
from
ggazzo:rocketchat-channel-settings-mail-messages
Apr 3, 2017
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
14 changes: 0 additions & 14 deletions
14
packages/rocketchat-channel-settings-mail-messages/client/lib/startup.coffee
This file was deleted.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
packages/rocketchat-channel-settings-mail-messages/client/lib/startup.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import resetSelection from '../resetSelection'; | ||
Meteor.startup(() => { | ||
RocketChat.ChannelSettings.addOption({ | ||
group: ['room'], | ||
id: 'mail-messages', | ||
template: 'channelSettingsMailMessages', | ||
validation() { | ||
return RocketChat.authz.hasAllPermission('mail-messages'); | ||
} | ||
}); | ||
RocketChat.callbacks.add('roomExit', () => resetSelection(false), RocketChat.callbacks.priority.MEDIUM, 'room-exit-mail-messages'); | ||
}); |
11 changes: 11 additions & 0 deletions
11
packages/rocketchat-channel-settings-mail-messages/client/resetSelection.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
export default function resetSelection(reset) { | ||
const [el] = $('.messages-box'); | ||
if (!el) { | ||
return; | ||
} | ||
const view = Blaze.getView(el); | ||
if (view && typeof view.templateInstance === 'function') { | ||
const {resetSelection} = view.templateInstance(); | ||
typeof resetSelection === 'function' && resetSelection(reset); | ||
} | ||
} |
14 changes: 0 additions & 14 deletions
14
...rocketchat-channel-settings-mail-messages/client/views/channelSettingsMailMessages.coffee
This file was deleted.
Oops, something went wrong.
17 changes: 17 additions & 0 deletions
17
...ges/rocketchat-channel-settings-mail-messages/client/views/channelSettingsMailMessages.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import resetSelection from '../resetSelection'; | ||
|
||
Template.channelSettingsMailMessages.helpers({ | ||
canSendEmail() { | ||
return FlowRouter.getRouteName() !== 'admin-rooms'; | ||
} | ||
}); | ||
|
||
Template.channelSettingsMailMessages.events({ | ||
'click button.mail-messages'() { | ||
Session.set('channelSettingsMailMessages', Session.get('openedRoom')); | ||
this.tabBar.setTemplate('mailMessagesInstructions'); | ||
resetSelection(true); | ||
} | ||
}); | ||
|
||
Template.channelSettingsMailMessages.onCreated(() =>resetSelection(false)); |
126 changes: 0 additions & 126 deletions
126
...es/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.coffee
This file was deleted.
Oops, something went wrong.
148 changes: 148 additions & 0 deletions
148
packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,148 @@ | ||
import toastr from 'toastr'; | ||
import resetSelection from '../resetSelection'; | ||
Template.mailMessagesInstructions.helpers({ | ||
name() { | ||
return Meteor.user().name; | ||
}, | ||
email() { | ||
const {emails} = Meteor.user(); | ||
return emails && emails[0].address; | ||
}, | ||
roomName() { | ||
const room = ChatRoom.findOne(Session.get('openedRoom')); | ||
return room && room.name; | ||
}, | ||
erroredEmails() { | ||
const instance = Template.instance(); | ||
return instance && instance.erroredEmails.get().join(', '); | ||
}, | ||
autocompleteSettings() { | ||
return { | ||
limit: 10, | ||
rules: [ | ||
{ | ||
collection: 'CachedChannelList', | ||
subscription: 'userAutocomplete', | ||
field: 'username', | ||
template: Template.userSearch, | ||
noMatchTemplate: Template.userSearchEmpty, | ||
matchAll: true, | ||
filter: { | ||
exceptions: Template.instance().selectedUsers.get() | ||
}, | ||
selector(match) { | ||
return { | ||
term: match | ||
}; | ||
}, | ||
sort: 'username' | ||
} | ||
] | ||
}; | ||
}, | ||
selectedUsers() { | ||
return Template.instance().selectedUsers.get(); | ||
} | ||
}); | ||
|
||
Template.mailMessagesInstructions.events({ | ||
'click .cancel'(e, t) { | ||
return t.reset(); | ||
}, | ||
'click .send'(e, t) { | ||
t.$('.error').hide(); | ||
const $btn = t.$('button.send'); | ||
const oldBtnValue = $btn.html(); | ||
$btn.html(TAPi18n.__('Sending')); | ||
const selectedMessages = $('.messages-box .message.selected'); | ||
let error = false; | ||
if (selectedMessages.length === 0) { | ||
t.$('.error-select').show(); | ||
error = true; | ||
} | ||
if (t.$('input[name=to_emails]').val().trim()) { | ||
const rfcMailPatternWithName = /^(?:.*<)?([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)(?:>?)$/; | ||
const emails = t.$('input[name=to_emails]').val().trim().split(','); | ||
const erroredEmails = []; | ||
for (let j = 0, len = emails.length; j < len; j++) { | ||
const email = emails[j]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
if (!rfcMailPatternWithName.test(email.trim())) { | ||
erroredEmails.push(email.trim()); | ||
} | ||
} | ||
t.erroredEmails.set(erroredEmails); | ||
if (erroredEmails.length > 0) { | ||
t.$('.error-invalid-emails').show(); | ||
error = true; | ||
} | ||
} else if (!t.selectedUsers.get().length) { | ||
t.$('.error-missing-to').show(); | ||
error = true; | ||
} | ||
if (error) { | ||
return $btn.html(oldBtnValue); | ||
} | ||
const data = { | ||
rid: Session.get('openedRoom'), | ||
to_users: t.selectedUsers.get(), | ||
to_emails: t.$('input[name=to_emails]').val().trim(), | ||
subject: t.$('input[name=subject]').val().trim(), | ||
messages: selectedMessages.map(function(i, message) { | ||
return message.id; | ||
}).toArray(), | ||
language: localStorage.getItem('userLanguage') | ||
}; | ||
return Meteor.call('mailMessages', data, function(err, result) { | ||
$btn.html(oldBtnValue); | ||
if (err != null) { | ||
return handleError(err); | ||
} | ||
console.log(result); | ||
toastr.success(TAPi18n.__('Your_email_has_been_queued_for_sending')); | ||
return t.reset(); | ||
}); | ||
}, | ||
'click .select-all'(e, t) { | ||
t.$('.error-select').hide(); | ||
const view = Blaze.getView($('.messages-box')[0]); | ||
if (view != null) { | ||
if (typeof view.templateInstance === 'function') { | ||
const chat = ChatMessage.find({ | ||
rid: Session.get('openedRoom') | ||
}); | ||
view.templateInstance().selectedMessages = _.pluck(chat && chat.fetch(), '_id'); | ||
} | ||
} | ||
return $('.messages-box .message').addClass('selected'); | ||
}, | ||
'autocompleteselect #to_users'(event, instance, doc) { | ||
instance.selectedUsers.set(instance.selectedUsers.get().concat(doc.username)); | ||
event.currentTarget.value = ''; | ||
return event.currentTarget.focus(); | ||
}, | ||
'click .remove-to-user'() { | ||
let users = Template.instance().selectedUsers.get(); | ||
users = _.reject(Template.instance().selectedUsers.get(), (_id) => { | ||
return _id === this.valueOf(); | ||
}); | ||
Template.instance().selectedUsers.set(users); | ||
return $('#to_users').focus(); | ||
} | ||
}); | ||
|
||
Template.mailMessagesInstructions.onCreated(function() { | ||
const currentData = Template.currentData(); | ||
this.autoCompleteCollection = new Mongo.Collection(null); | ||
this.selectedUsers = new ReactiveVar([]); | ||
this.erroredEmails = new ReactiveVar([]); | ||
this.reset = () => { | ||
this.selectedUsers.set([]); | ||
currentData.tabBar.setTemplate('channelSettings'); | ||
resetSelection(false); | ||
}; | ||
return this.autorun(() => { | ||
if (Session.get('channelSettingsMailMessages') !== Session.get('openedRoom')) { | ||
return this.reset(); | ||
} | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
packages/rocketchat-channel-settings-mail-messages/server/lib/startup.coffee
This file was deleted.
Oops, something went wrong.
9 changes: 9 additions & 0 deletions
9
packages/rocketchat-channel-settings-mail-messages/server/lib/startup.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
Meteor.startup(function() { | ||
const permission = { | ||
_id: 'mail-messages', | ||
roles: ['admin'] | ||
}; | ||
return RocketChat.models.Permissions.upsert(permission._id, { | ||
$setOnInsert: permission | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
emails
can exists but be empty