Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-12-27 19:07:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(mail-rules): use the right field name to get an account id

Browse source 
Summary:
With the fix to the delta-processor, this is all that's needed to
get mail rules working! Some places were trying to use 'accountId'
to access an account object's id, but it needs to be 'id' instead.

Test Plan: tested locally

Reviewers: jackie

Reviewed By: jackie

Differential Revision: https://phab.nylas.com/D3525
This commit is contained in:
Halla Moore 2016-12-14 15:34:49 -08:00
parent 99b428f90c
commit d03049b403
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal_packages/preferences/lib/tabs/preferences-mail-rules.jsx
View file

@ -45,7 +45,7 @@ class PreferencesMailRules extends React.Component {
if (!accounts.find(acct => acct === currentAccount)) {
currentAccount = accounts[0];
}
const rules = MailRulesStore.rulesForAccountId(currentAccount.accountId);
const rules = MailRulesStore.rulesForAccountId(currentAccount.id);
const selectedRule = this.state && this.state.selectedRule ? _.findWhere(rules, {id: this.state.selectedRule.id}) : rules[0];
return {
@ -61,7 +61,7 @@ class PreferencesMailRules extends React.Component {
_onSelectAccount = (event) => {
const accountId = event.target.value;
const currentAccount = this.state.accounts.find(acct => acct.accountId === accountId);
const currentAccount = this.state.accounts.find(acct => acct.id === accountId);
this.setState({currentAccount: currentAccount}, () => {
this.setState(this._getStateFromStores())
});
@ -83,12 +83,12 @@ class PreferencesMailRules extends React.Component {
NylasEnv.showErrorDialog("One or more of your mail rules requires the bodies of messages being processed. These rules can't be run on your entire mailbox.");
}
const task = new ReprocessMailRulesTask(this.state.currentAccount.accountId)
const task = new ReprocessMailRulesTask(this.state.currentAccount.id)
Actions.queueTask(task);
}
_onAddRule = () => {
Actions.addMailRule({accountId: this.state.currentAccount.accountId});
Actions.addMailRule({accountId: this.state.currentAccount.id});
}
_onSelectRule = (rule) => {
@ -134,12 +134,12 @@ class PreferencesMailRules extends React.Component {
_renderAccountPicker() {
const options = this.state.accounts.map(account =>
<option value={account.accountId} key={account.accountId}>{account.label}</option>
<option value={account.id} key={account.id}>{account.label}</option>
);
return (
<select
value={this.state.currentAccount.accountId}
value={this.state.currentAccount.id}
onChange={this._onSelectAccount}
style={{margin: 0, minWidth: 200}}
>