Add cron status to admin help section
[MAILPOET-1457]
This commit is contained in:
26
assets/js/src/common/print_boolean.jsx
Normal file
26
assets/js/src/common/print_boolean.jsx
Normal file
@ -0,0 +1,26 @@
|
||||
import React from 'react';
|
||||
import MailPoet from 'mailpoet';
|
||||
|
||||
const PrintBoolean = props => (
|
||||
<span>
|
||||
{(props.children === true && props.truthy) ||
|
||||
(props.children === false && props.falsy) ||
|
||||
(props.unknown)}
|
||||
</span>
|
||||
);
|
||||
|
||||
PrintBoolean.propTypes = {
|
||||
truthy: React.PropTypes.string,
|
||||
falsy: React.PropTypes.string,
|
||||
unknown: React.PropTypes.string,
|
||||
children: React.PropTypes.bool,
|
||||
};
|
||||
|
||||
PrintBoolean.defaultProps = {
|
||||
truthy: MailPoet.I18n.t('yes'),
|
||||
falsy: MailPoet.I18n.t('no'),
|
||||
unknown: MailPoet.I18n.t('unknown'),
|
||||
children: null,
|
||||
};
|
||||
|
||||
module.exports = PrintBoolean;
|
71
assets/js/src/help/cron_status.jsx
Normal file
71
assets/js/src/help/cron_status.jsx
Normal file
@ -0,0 +1,71 @@
|
||||
import MailPoet from 'mailpoet';
|
||||
import React from 'react';
|
||||
import PrintBoolean from 'common/print_boolean.jsx';
|
||||
|
||||
function renderStatusTableRow(title, value) {
|
||||
return (
|
||||
<tr>
|
||||
<td className={'row-title'}>{ title }</td><td>{ value }</td>
|
||||
</tr>
|
||||
);
|
||||
}
|
||||
|
||||
const CronStatus = (props) => {
|
||||
const status = props.status_data;
|
||||
const activeStatusMapping = {
|
||||
active: MailPoet.I18n.t('cronRunning'),
|
||||
inactive: MailPoet.I18n.t('cronWaiting'),
|
||||
};
|
||||
return (
|
||||
<div>
|
||||
<h2>{MailPoet.I18n.t('systemStatusCronStatusTitle')}</h2>
|
||||
<table className={'widefat fixed'} style={{ maxWidth: '400px' }}>
|
||||
<tbody>
|
||||
{renderStatusTableRow(
|
||||
MailPoet.I18n.t('accessible'),
|
||||
<PrintBoolean>{status.accessible}</PrintBoolean>)
|
||||
}
|
||||
{renderStatusTableRow(
|
||||
MailPoet.I18n.t('status'),
|
||||
activeStatusMapping[status.status] ? activeStatusMapping[status.status] : MailPoet.I18n.t('unknown'))
|
||||
}
|
||||
{renderStatusTableRow(
|
||||
MailPoet.I18n.t('lastUpdated'),
|
||||
status.updated_at ? MailPoet.Date.full(status.updated_at * 1000) : MailPoet.I18n.t('unknown'))
|
||||
}
|
||||
{renderStatusTableRow(
|
||||
MailPoet.I18n.t('lastRunStarted'),
|
||||
status.run_accessed_at ? MailPoet.Date.full(status.run_started_at * 1000) : MailPoet.I18n.t('unknown'))
|
||||
}
|
||||
{renderStatusTableRow(
|
||||
MailPoet.I18n.t('lastRunCompleted'),
|
||||
status.run_completed_at ? MailPoet.Date.full(status.run_completed_at * 1000) : MailPoet.I18n.t('unknown'))
|
||||
}
|
||||
{renderStatusTableRow(MailPoet.I18n.t('lastSeenError'), status.last_error || '-')}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
CronStatus.propTypes = {
|
||||
status_data: React.PropTypes.shape({
|
||||
accessible: React.PropTypes.bool,
|
||||
status: React.PropTypes.string,
|
||||
updated_at: React.PropTypes.number,
|
||||
run_accessed_at: React.PropTypes.number,
|
||||
run_completed_at: React.PropTypes.number,
|
||||
}).isRequired,
|
||||
};
|
||||
|
||||
CronStatus.defaultProps = {
|
||||
status_data: {
|
||||
accessible: null,
|
||||
status: null,
|
||||
updated_at: null,
|
||||
run_accessed_at: null,
|
||||
run_completed_at: null,
|
||||
},
|
||||
};
|
||||
|
||||
module.exports = CronStatus;
|
@ -1,6 +1,7 @@
|
||||
import MailPoet from 'mailpoet';
|
||||
import React from 'react';
|
||||
import ReactStringReplace from 'react-string-replace';
|
||||
import CronStatus from './cron_status.jsx';
|
||||
import Tabs from './tabs.jsx';
|
||||
|
||||
function renderStatusMessage(status, error, link) {
|
||||
@ -65,6 +66,7 @@ function SystemStatus() {
|
||||
</div>
|
||||
{renderCronSection(systemStatusData)}
|
||||
{renderMSSSection(systemStatusData)}
|
||||
<CronStatus status_data={systemStatusData.cronStatus} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
@ -448,17 +448,19 @@ class Menu {
|
||||
|
||||
function help() {
|
||||
$system_info_data = Beacon::getData();
|
||||
$system_status_data = array(
|
||||
'cron' => array(
|
||||
$system_status_data = [
|
||||
'cron' => [
|
||||
'url' => CronHelper::getCronUrl(CronDaemon::ACTION_PING),
|
||||
'isReachable' => CronHelper::pingDaemon(true)
|
||||
),
|
||||
'mss' => array(
|
||||
],
|
||||
'mss' => [
|
||||
'enabled' => (Bridge::isMPSendingServiceEnabled()) ?
|
||||
array('isReachable' => Bridge::pingBridge()) :
|
||||
['isReachable' => Bridge::pingBridge()] :
|
||||
false
|
||||
)
|
||||
);
|
||||
],
|
||||
'cronStatus' => CronHelper::getDaemon(),
|
||||
];
|
||||
$system_status_data['cronStatus']['accessible'] = CronHelper::isDaemonAccessible();
|
||||
$this->displayPage(
|
||||
'help.html',
|
||||
array(
|
||||
|
@ -33,6 +33,18 @@
|
||||
'knowledgeBaseButton': __('Visit our Knowledge Base for more articles'),
|
||||
'systemInfoIntro': __('The information below is useful when you need to get in touch with our support. Just copy all the text below and paste it into a message to us.'),
|
||||
'systemInfoDataError': __('Sorry, there was an error, please try again later.'),
|
||||
'systemStatusCronStatusTitle': __('Cron'),
|
||||
'lastUpdated': __('Last updated'),
|
||||
'lastRunStarted': __('Last run started'),
|
||||
'lastRunCompleted': __('Last run completed'),
|
||||
'lastSeenError': __('Last seen error'),
|
||||
'unknown': __('unknown'),
|
||||
'accessible': __('Accessible'),
|
||||
'status': __('Status'),
|
||||
'yes': __('yes'),
|
||||
'no': __('no'),
|
||||
'cronRunning': __('running'),
|
||||
'cronWaiting': __('waiting for the next run'),
|
||||
}) %>
|
||||
<% endblock %>
|
||||
|
||||
|
Reference in New Issue
Block a user