Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-10-06 03:14:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(sync-state): ignore Account.syncState=="stopped" for now

Browse source 
Valid accounts that are syncing properly can reviece a delta for
Account.syncState==stopped currently, due to some quirks in the backend.
Ignore "stopped" until it unabiguously represents an error state.
This commit is contained in:
Drew Regitsky 2016-03-18 10:41:08 -07:00
parent e0db484276
commit 3af91d22b6
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal_packages/account-error-header/lib/account-error-header.jsx
View file

@ -55,7 +55,7 @@ export default class AccountErrorHeader extends React.Component {
} }
render() { render() {
const errorAccounts = this.state.accounts.filter(a => a.syncState !== "running"); const errorAccounts = this.state.accounts.filter(a => a.hasSyncStateError());
if (errorAccounts.length === 1) { if (errorAccounts.length === 1) {
const account = errorAccounts[0]; const account = errorAccounts[0];

2
internal_packages/preferences/lib/tabs/preferences-account-details.jsx
View file

@ -142,7 +142,7 @@ class PreferencesAccountDetails extends Component {
} }
_renderSyncErrorDetails() { _renderSyncErrorDetails() {
const {account} = this.state; const {account} = this.state;
if (account.syncState !== Account.SYNC_STATE_RUNNING) { if (account.hasSyncStateError()) {
switch (account.syncState) { switch (account.syncState) {
case Account.SYNC_STATE_AUTH_FAILED: case Account.SYNC_STATE_AUTH_FAILED:
return this._renderErrorDetail( return this._renderErrorDetail(

2
internal_packages/preferences/lib/tabs/preferences-account-list.jsx
View file

@ -26,7 +26,7 @@ class PreferencesAccountList extends Component {
_renderAccount = (account)=> { _renderAccount = (account)=> {
const label = account.label; const label = account.label;
const accountSub = `${account.name || 'No name provided'} <${account.emailAddress}>`; const accountSub = `${account.name || 'No name provided'} <${account.emailAddress}>`;
const syncError = account.syncState !== Account.SYNC_STATE_RUNNING; const syncError = account.hasSyncStateError();
return ( return (
<div <div

4
src/flux/models/account.coffee
View file

@ -151,5 +151,9 @@ class Account extends ModelWithMetadata
else else
archiveCategory archiveCategory
hasSyncStateError: ->
# TODO: ignoring "stopped" until it's no longer overloaded on API
return @syncState != Account.SYNC_STATE_RUNNING &&
@syncState != Account.SYNC_STATE_STOPPED
module.exports = Account module.exports = Account