Fix times in task lists on Help > System Status
The time adjustments are not necessary because we rely on WP setting timezone to UTC. Manipulation in adjustTimezone difference was causing us to display GMT time. [MAILPOET-6142]
This commit is contained in:
committed by
Aschepikov
parent
dac4eb82a4
commit
ef5ee6d59a
@@ -6,8 +6,6 @@ import {
|
|||||||
import { MailPoet } from 'mailpoet';
|
import { MailPoet } from 'mailpoet';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import { __, sprintf } from '@wordpress/i18n';
|
import { __, sprintf } from '@wordpress/i18n';
|
||||||
import parseDate from 'date-fns/parse';
|
|
||||||
import { isPast } from 'date-fns';
|
|
||||||
|
|
||||||
type TasksListDataRowProps = {
|
type TasksListDataRowProps = {
|
||||||
id: number;
|
id: number;
|
||||||
@@ -37,13 +35,11 @@ function TaskButton({ task, type }: Props): JSX.Element {
|
|||||||
const isCancelButton = type === 'cancel';
|
const isCancelButton = type === 'cancel';
|
||||||
const isRescheduleButton = type === 'reschedule';
|
const isRescheduleButton = type === 'reschedule';
|
||||||
|
|
||||||
let scheduledDate = task.scheduledAt
|
const scheduledDate = task.scheduledAt;
|
||||||
? parseDate(task.scheduledAt, 'yyyy-MM-dd HH:mm:ss', new Date())
|
const isScheduledInPast = MailPoet.Date.isInPastGmt(
|
||||||
: undefined;
|
scheduledDate,
|
||||||
if (scheduledDate) {
|
new Date().toISOString(),
|
||||||
scheduledDate = MailPoet.Date.adjustForTimezoneDifference(scheduledDate);
|
);
|
||||||
}
|
|
||||||
const isScheduledInPast = isPast(scheduledDate);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
@@ -1,5 +1,4 @@
|
|||||||
import { MailPoet } from 'mailpoet';
|
import { MailPoet } from 'mailpoet';
|
||||||
import parseDate from 'date-fns/parse';
|
|
||||||
import { CancelTaskButton, RescheduleTaskButton } from './tasks-list-actions';
|
import { CancelTaskButton, RescheduleTaskButton } from './tasks-list-actions';
|
||||||
|
|
||||||
export type Props = {
|
export type Props = {
|
||||||
@@ -28,31 +27,6 @@ function TasksListDataRow({ type, task }: Props): JSX.Element {
|
|||||||
const canCancelTask = type === 'scheduled' || type === 'running';
|
const canCancelTask = type === 'scheduled' || type === 'running';
|
||||||
const canRescheduleTask = type === 'cancelled';
|
const canRescheduleTask = type === 'cancelled';
|
||||||
|
|
||||||
let scheduled: Date;
|
|
||||||
if (showScheduledAt) {
|
|
||||||
scheduled = parseDate(task.scheduledAt, 'yyyy-MM-dd HH:mm:ss', new Date());
|
|
||||||
if (scheduled) {
|
|
||||||
scheduled = MailPoet.Date.adjustForTimezoneDifference(scheduled);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let cancelled: Date;
|
|
||||||
if (showCancelledAt) {
|
|
||||||
cancelled = parseDate(task.cancelledAt, 'yyyy-MM-dd HH:mm:ss', new Date());
|
|
||||||
if (cancelled) {
|
|
||||||
cancelled = MailPoet.Date.adjustForTimezoneDifference(cancelled);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let updated: Date = parseDate(
|
|
||||||
task.updatedAt,
|
|
||||||
'yyyy-MM-dd HH:mm:ss',
|
|
||||||
new Date(),
|
|
||||||
);
|
|
||||||
if (updated) {
|
|
||||||
updated = MailPoet.Date.adjustForTimezoneDifference(updated);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<tr>
|
<tr>
|
||||||
<td className="column column-primary">{task.id}</td>
|
<td className="column column-primary">{task.id}</td>
|
||||||
@@ -86,21 +60,21 @@ function TasksListDataRow({ type, task }: Props): JSX.Element {
|
|||||||
{showScheduledAt ? (
|
{showScheduledAt ? (
|
||||||
<td className="column-date">
|
<td className="column-date">
|
||||||
<abbr>{`${MailPoet.Date.shortFromGmt(
|
<abbr>{`${MailPoet.Date.shortFromGmt(
|
||||||
scheduled,
|
task.scheduledAt,
|
||||||
)} ${MailPoet.Date.timeFromGmt(scheduled)}`}</abbr>
|
)} ${MailPoet.Date.timeFromGmt(task.scheduledAt)}`}</abbr>
|
||||||
</td>
|
</td>
|
||||||
) : null}
|
) : null}
|
||||||
{showCancelledAt ? (
|
{showCancelledAt ? (
|
||||||
<td className="column-date">
|
<td className="column-date">
|
||||||
<abbr>{`${MailPoet.Date.shortFromGmt(
|
<abbr>{`${MailPoet.Date.shortFromGmt(
|
||||||
cancelled,
|
task.cancelledAt,
|
||||||
)} ${MailPoet.Date.timeFromGmt(cancelled)}`}</abbr>
|
)} ${MailPoet.Date.timeFromGmt(task.cancelledAt)}`}</abbr>
|
||||||
</td>
|
</td>
|
||||||
) : null}
|
) : null}
|
||||||
<td className="column-date">
|
<td className="column-date">
|
||||||
<abbr>{`${MailPoet.Date.shortFromGmt(
|
<abbr>{`${MailPoet.Date.shortFromGmt(
|
||||||
updated,
|
task.updatedAt,
|
||||||
)} ${MailPoet.Date.timeFromGmt(updated)}`}</abbr>
|
)} ${MailPoet.Date.timeFromGmt(task.updatedAt)}`}</abbr>
|
||||||
</td>
|
</td>
|
||||||
{canCancelTask ? (
|
{canCancelTask ? (
|
||||||
<td>
|
<td>
|
||||||
|
Reference in New Issue
Block a user