|
@@ -1,39 +1,62 @@
|
|
|
import React from 'react';
|
|
import React from 'react';
|
|
|
import PropTypes from 'prop-types';
|
|
import PropTypes from 'prop-types';
|
|
|
import { withTranslation } from 'react-i18next';
|
|
import { withTranslation } from 'react-i18next';
|
|
|
|
|
+import loggerFactory from '@alias/logger';
|
|
|
|
|
|
|
|
import { createSubscribedElement } from '../../UnstatedUtils';
|
|
import { createSubscribedElement } from '../../UnstatedUtils';
|
|
|
|
|
+import { toastSuccess, toastError } from '../../../util/apiNotification';
|
|
|
|
|
|
|
|
import AppContainer from '../../../services/AppContainer';
|
|
import AppContainer from '../../../services/AppContainer';
|
|
|
|
|
+import AdminAppContainer from '../../../services/AdminAppContainer';
|
|
|
|
|
+
|
|
|
|
|
+const logger = loggerFactory('growi:appSettings');
|
|
|
|
|
|
|
|
class MailSetting extends React.Component {
|
|
class MailSetting extends React.Component {
|
|
|
|
|
|
|
|
constructor(props) {
|
|
constructor(props) {
|
|
|
super(props);
|
|
super(props);
|
|
|
|
|
|
|
|
- this.state = {
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ this.submitHandler = this.submitHandler.bind(this);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ async submitHandler() {
|
|
|
|
|
+ const { t, adminAppContainer } = this.props;
|
|
|
|
|
+
|
|
|
|
|
+ try {
|
|
|
|
|
+ await adminAppContainer.updateMailSettingHandler();
|
|
|
|
|
+ toastSuccess(t('app_setting.updated_app_setting'));
|
|
|
|
|
+ }
|
|
|
|
|
+ catch (err) {
|
|
|
|
|
+ toastError(err);
|
|
|
|
|
+ logger.error(err);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
render() {
|
|
render() {
|
|
|
- const { t } = this.props;
|
|
|
|
|
|
|
+ const { t, adminAppContainer } = this.props;
|
|
|
|
|
|
|
|
return (
|
|
return (
|
|
|
<React.Fragment>
|
|
<React.Fragment>
|
|
|
- <p className="well">{t('app_setting.SMTP_used')} {t('app_setting.SMTP_but_AWS')}<br />{t('app_setting.neihter_of')}</p>
|
|
|
|
|
|
|
+ <p className="well">
|
|
|
|
|
+ {t('app_setting.SMTP_used')} {t('app_setting.SMTP_but_AWS')}
|
|
|
|
|
+ <br />
|
|
|
|
|
+ {t('app_setting.neihter_of')}
|
|
|
|
|
+ </p>
|
|
|
<div className="row">
|
|
<div className="row">
|
|
|
<div className="col-md-12">
|
|
<div className="col-md-12">
|
|
|
<div className="form-group">
|
|
<div className="form-group">
|
|
|
- <label htmlFor="settingForm[mail.from]" className="col-xs-3 control-label">{t('app_setting.From e-mail address')}</label>
|
|
|
|
|
|
|
+ <label htmlFor="settingForm[mail.from]" className="col-xs-3 control-label">
|
|
|
|
|
+ {t('app_setting.From e-mail address')}
|
|
|
|
|
+ </label>
|
|
|
<div className="col-xs-6">
|
|
<div className="col-xs-6">
|
|
|
<input
|
|
<input
|
|
|
className="form-control"
|
|
className="form-control"
|
|
|
id="settingForm[mail.from]"
|
|
id="settingForm[mail.from]"
|
|
|
type="text"
|
|
type="text"
|
|
|
name="settingForm[mail:from]"
|
|
name="settingForm[mail:from]"
|
|
|
- placeholder="{{ t('eg') }} mail@growi.org"
|
|
|
|
|
- value="{{ getConfig('crowi', 'mail:from') | default('') }}"
|
|
|
|
|
|
|
+ placeholder={`${t('eg')} mail@growi.org`}
|
|
|
|
|
+ dafalutValue={adminAppContainer.state.fromAddress}
|
|
|
|
|
+ onChange={(e) => { adminAppContainer.changeFromAddress(e.target.value) }}
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -43,23 +66,25 @@ class MailSetting extends React.Component {
|
|
|
<div className="row">
|
|
<div className="row">
|
|
|
<div className="col-md-12">
|
|
<div className="col-md-12">
|
|
|
<div className="form-group">
|
|
<div className="form-group">
|
|
|
- <label className="col-xs-3 control-label">{ t('app_setting.SMTP settings') }</label>
|
|
|
|
|
|
|
+ <label className="col-xs-3 control-label">{t('app_setting.SMTP settings')}</label>
|
|
|
<div className="col-xs-4">
|
|
<div className="col-xs-4">
|
|
|
- <label>{ t('app_setting.Host') }</label>
|
|
|
|
|
|
|
+ <label>{t('app_setting.Host')}</label>
|
|
|
<input
|
|
<input
|
|
|
className="form-control"
|
|
className="form-control"
|
|
|
type="text"
|
|
type="text"
|
|
|
name="settingForm[mail:smtpHost]"
|
|
name="settingForm[mail:smtpHost]"
|
|
|
- value="{{ getConfig('crowi', 'mail:smtpHost') | default('') }}"
|
|
|
|
|
|
|
+ defaultValue={adminAppContainer.state.smtpHost}
|
|
|
|
|
+ onChange={(e) => { adminAppContainer.changeSmtpHost(e.target.value) }}
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
<div className="col-xs-2">
|
|
<div className="col-xs-2">
|
|
|
- <label>{ t('app_setting.Port') }</label>
|
|
|
|
|
|
|
+ <label>{t('app_setting.Port')}</label>
|
|
|
<input
|
|
<input
|
|
|
className="form-control"
|
|
className="form-control"
|
|
|
type="text"
|
|
type="text"
|
|
|
name="settingForm[mail:smtpPort]"
|
|
name="settingForm[mail:smtpPort]"
|
|
|
- value="{{ getConfig('crowi', 'mail:smtpPort') | default('') }}"
|
|
|
|
|
|
|
+ defaultValue={adminAppContainer.state.smtpPort}
|
|
|
|
|
+ onChange={(e) => { adminAppContainer.changeSmtpPort(e.target.value) }}
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -70,21 +95,23 @@ class MailSetting extends React.Component {
|
|
|
<div className="col-md-12">
|
|
<div className="col-md-12">
|
|
|
<div className="form-group">
|
|
<div className="form-group">
|
|
|
<div className="col-xs-3 col-xs-offset-3">
|
|
<div className="col-xs-3 col-xs-offset-3">
|
|
|
- <label>{ t('app_setting.User') }</label>
|
|
|
|
|
|
|
+ <label>{t('app_setting.User')}</label>
|
|
|
<input
|
|
<input
|
|
|
className="form-control"
|
|
className="form-control"
|
|
|
type="text"
|
|
type="text"
|
|
|
name="settingForm[mail:smtpUser]"
|
|
name="settingForm[mail:smtpUser]"
|
|
|
- value="{{ getConfig('crowi', 'mail:smtpUser') | default('') }}"
|
|
|
|
|
|
|
+ defaultValue={adminAppContainer.state.SmtpUser}
|
|
|
|
|
+ onChange={(e) => { adminAppContainer.changeSmtpUser(e.target.value) }}
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
<div className="col-xs-3">
|
|
<div className="col-xs-3">
|
|
|
- <label>{ t('Password') }</label>
|
|
|
|
|
|
|
+ <label>{t('Password')}</label>
|
|
|
<input
|
|
<input
|
|
|
className="form-control"
|
|
className="form-control"
|
|
|
type="password"
|
|
type="password"
|
|
|
name="settingForm[mail:smtpPassword]"
|
|
name="settingForm[mail:smtpPassword]"
|
|
|
- value="{{ getConfig('crowi', 'mail:smtpPassword') | default('') }}"
|
|
|
|
|
|
|
+ defaultValue={adminAppContainer.state.smtpPassword}
|
|
|
|
|
+ onChange={(e) => { adminAppContainer.changeSmtpPassword(e.target.value) }}
|
|
|
/>
|
|
/>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -95,8 +122,7 @@ class MailSetting extends React.Component {
|
|
|
<div className="col-md-12">
|
|
<div className="col-md-12">
|
|
|
<div className="form-group">
|
|
<div className="form-group">
|
|
|
<div className="col-xs-offset-3 col-xs-6">
|
|
<div className="col-xs-offset-3 col-xs-6">
|
|
|
- <input type="hidden" name="_csrf" value="{{ csrf() }}" />
|
|
|
|
|
- <button type="submit" className="btn btn-primary">
|
|
|
|
|
|
|
+ <button type="submit" className="btn btn-primary" onClick={this.submitHandler}>
|
|
|
{t('app_setting.Update')}
|
|
{t('app_setting.Update')}
|
|
|
</button>
|
|
</button>
|
|
|
</div>
|
|
</div>
|
|
@@ -113,12 +139,13 @@ class MailSetting extends React.Component {
|
|
|
* Wrapper component for using unstated
|
|
* Wrapper component for using unstated
|
|
|
*/
|
|
*/
|
|
|
const MailSettingWrapper = (props) => {
|
|
const MailSettingWrapper = (props) => {
|
|
|
- return createSubscribedElement(MailSetting, props, [AppContainer]);
|
|
|
|
|
|
|
+ return createSubscribedElement(MailSetting, props, [AppContainer, AdminAppContainer]);
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
MailSetting.propTypes = {
|
|
MailSetting.propTypes = {
|
|
|
t: PropTypes.func.isRequired, // i18next
|
|
t: PropTypes.func.isRequired, // i18next
|
|
|
appContainer: PropTypes.instanceOf(AppContainer).isRequired,
|
|
appContainer: PropTypes.instanceOf(AppContainer).isRequired,
|
|
|
|
|
+ adminAppContainer: PropTypes.instanceOf(AdminAppContainer).isRequired,
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
export default withTranslation()(MailSettingWrapper);
|
|
export default withTranslation()(MailSettingWrapper);
|