PLT-3647 Email Batching (#3718)
* PLT-3647 Added config settings for email batching * PLT-3647 Refactored generation of email notification * PLT-3647 Added serverside code for email batching * PLT-3647 Updated settings UI to enable email batching * PLT-3647 Removed debug code * PLT-3647 Fixed 0-padding of minutes in batched notification * PLT-3647 Updated clientside UI for when email batching is disabled * Go fmt * PLT-3647 Changed email batching to be disabled by default * Updated batched email message * Added email batching toggle to system console * Changed Email Notifications > Immediate setting to a 30 second batch interval * Go fmt * Fixed link to Mattermost icon in batched email notification * Updated users to use 30 second email batching by default * Fully disabled email batching when clustering is enabled * Fixed email batching setting in the system console * Fixed casing of 'Send Email notifications' -> 'Send email notifications' * Updating UI Improvements for email batching (#3736) * Updated text for notification settings and SiteURL. * Prevented enabling email batching when SiteURL isn't set in the system console * Re-added a couple debug messages * Added warning text when clustering is enabled
Этот коммит содержится в:
Harrison Healey
коммит произвёл
Christopher Speller
Christopher Speller
родитель
dde158c57f
Коммит
8203fd16ce
211
webapp/components/user_settings/email_notification_setting.jsx
Обычный файл
211
webapp/components/user_settings/email_notification_setting.jsx
Обычный файл
@@ -0,0 +1,211 @@
|
||||
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
import React from 'react';
|
||||
|
||||
import {savePreference} from 'utils/async_client.jsx';
|
||||
import PreferenceStore from 'stores/preference_store.jsx';
|
||||
import {localizeMessage} from 'utils/utils.jsx';
|
||||
|
||||
import {FormattedMessage} from 'react-intl';
|
||||
import SettingItemMin from 'components/setting_item_min.jsx';
|
||||
import SettingItemMax from 'components/setting_item_max.jsx';
|
||||
|
||||
import {Preferences} from 'utils/constants.jsx';
|
||||
|
||||
const INTERVAL_IMMEDIATE = 30; // "immediate" is a 30 second interval
|
||||
const INTERVAL_FIFTEEN_MINUTES = 15 * 60;
|
||||
const INTERVAL_HOUR = 60 * 60;
|
||||
|
||||
export default class EmailNotificationSetting extends React.Component {
|
||||
static propTypes = {
|
||||
activeSection: React.PropTypes.string.isRequired,
|
||||
updateSection: React.PropTypes.func.isRequired,
|
||||
enableEmail: React.PropTypes.bool.isRequired,
|
||||
onChange: React.PropTypes.func.isRequired,
|
||||
onSubmit: React.PropTypes.func.isRequired,
|
||||
serverError: React.PropTypes.string.isRequired
|
||||
};
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.submit = this.submit.bind(this);
|
||||
|
||||
this.expand = this.expand.bind(this);
|
||||
this.collapse = this.collapse.bind(this);
|
||||
|
||||
this.state = {
|
||||
emailInterval: PreferenceStore.getInt(Preferences.CATEGORY_NOTIFICATIONS, Preferences.EMAIL_INTERVAL, INTERVAL_IMMEDIATE)
|
||||
};
|
||||
}
|
||||
|
||||
handleChange(enableEmail, emailInterval) {
|
||||
this.props.onChange(enableEmail);
|
||||
this.setState({emailInterval});
|
||||
}
|
||||
|
||||
submit() {
|
||||
// until the rest of the notification settings are moved to preferences, we have to do this separately
|
||||
savePreference(Preferences.CATEGORY_NOTIFICATIONS, Preferences.EMAIL_INTERVAL, this.state.emailInterval.toString());
|
||||
|
||||
this.props.onSubmit();
|
||||
}
|
||||
|
||||
expand() {
|
||||
this.props.updateSection('email');
|
||||
}
|
||||
|
||||
collapse() {
|
||||
this.props.updateSection('');
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.props.activeSection !== 'email') {
|
||||
let description;
|
||||
|
||||
if (this.props.enableEmail === 'true') {
|
||||
switch (this.state.emailInterval) {
|
||||
case INTERVAL_IMMEDIATE:
|
||||
description = (
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.email.immediately'
|
||||
defaultMessage='Immediately'
|
||||
/>
|
||||
);
|
||||
break;
|
||||
case INTERVAL_HOUR:
|
||||
description = (
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.email.everyHour'
|
||||
defaultMessage='Every hour'
|
||||
/>
|
||||
);
|
||||
break;
|
||||
default:
|
||||
description = (
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.email.everyXMinutes'
|
||||
defaultMessage='Every {count, plural, one {minute} other {{count, number} minutes}}'
|
||||
values={{count: this.state.emailInterval / 60}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
} else {
|
||||
description = (
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.email.never'
|
||||
defaultMessage='Never'
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<SettingItemMin
|
||||
title={localizeMessage('user.settings.notifications.emailNotifications', 'Send Email notifications')}
|
||||
describe={description}
|
||||
updateSection={this.expand}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
let batchingOptions = null;
|
||||
let batchingInfo = null;
|
||||
if (window.mm_config.EnableEmailBatching === 'true') {
|
||||
batchingOptions = (
|
||||
<div>
|
||||
<div className='radio'>
|
||||
<label>
|
||||
<input
|
||||
type='radio'
|
||||
name='emailNotifications'
|
||||
checked={this.props.enableEmail === 'true' && this.state.emailInterval === INTERVAL_FIFTEEN_MINUTES}
|
||||
onChange={this.handleChange.bind(this, 'true', INTERVAL_FIFTEEN_MINUTES)}
|
||||
/>
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.email.everyXMinutes'
|
||||
defaultMessage='Every {count} minutes'
|
||||
values={{count: INTERVAL_FIFTEEN_MINUTES / 60}}
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
<div className='radio'>
|
||||
<label>
|
||||
<input
|
||||
type='radio'
|
||||
name='emailNotifications'
|
||||
checked={this.props.enableEmail === 'true' && this.state.emailInterval === INTERVAL_HOUR}
|
||||
onChange={this.handleChange.bind(this, 'true', INTERVAL_HOUR)}
|
||||
/>
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.everyHour'
|
||||
defaultMessage='Every hour'
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
batchingInfo = (
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.emailBatchingInfo'
|
||||
defaultMessage='Notifications are combined into a single email and sent at the maximum frequency selected here.'
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<SettingItemMax
|
||||
title={localizeMessage('user.settings.notifications.emailNotifications', 'Send email notifications')}
|
||||
inputs={[
|
||||
<div key='userNotificationEmailOptions'>
|
||||
<div className='radio'>
|
||||
<label>
|
||||
<input
|
||||
type='radio'
|
||||
name='emailNotifications'
|
||||
checked={this.props.enableEmail === 'true' && this.state.emailInterval === INTERVAL_IMMEDIATE}
|
||||
onChange={this.handleChange.bind(this, 'true', INTERVAL_IMMEDIATE)}
|
||||
/>
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.email.immediately'
|
||||
defaultMessage='Immediately'
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
{batchingOptions}
|
||||
<div className='radio'>
|
||||
<label>
|
||||
<input
|
||||
type='radio'
|
||||
name='emailNotifications'
|
||||
checked={this.props.enableEmail === 'false'}
|
||||
onChange={this.handleChange.bind(this, 'false', INTERVAL_IMMEDIATE)}
|
||||
/>
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.never'
|
||||
defaultMessage='Never'
|
||||
/>
|
||||
</label>
|
||||
</div>
|
||||
<br/>
|
||||
<div>
|
||||
<FormattedMessage
|
||||
id='user.settings.notifications.emailInfo'
|
||||
defaultMessage='Email notifications that are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.'
|
||||
values={{
|
||||
siteName: global.window.mm_config.SiteName
|
||||
}}
|
||||
/>
|
||||
{' '}
|
||||
{batchingInfo}
|
||||
</div>
|
||||
</div>
|
||||
]}
|
||||
submit={this.submit}
|
||||
server_error={this.props.serverError}
|
||||
updateSection={this.collapse}
|
||||
/>
|
||||
);
|
||||
}
|
||||
}
|
||||
Ссылка в новой задаче
Block a user