Skip to content

Commit 176a95c

Browse files
eemaanamirarbrandes
authored andcommitted
fix: converted UTC time to localtime in all the bulk email history tables
1 parent b249715 commit 176a95c

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
lines changed

src/components/bulk-email-tool/bulk-email-task-manager/BulkEmailContentHistory.jsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,17 @@ function BulkEmailContentHistory({ intl }) {
5454
function transformDataForTable() {
5555
let tableData = [];
5656
if (emailHistoryData) {
57-
tableData = emailHistoryData.map((item) => ({
58-
...item,
59-
subject: item.email.subject,
60-
sent_to: item.sent_to.join(', '),
61-
}));
57+
tableData = emailHistoryData.map((item) => {
58+
const [, day, year, time] = item.created.match(/(\d+), (\d+) at (.+) UTC/);
59+
const utcDateTimeString = `${year}-02-${day}T${time}Z`;
60+
const localDateTime = new Date(utcDateTimeString).toLocaleString();
61+
return {
62+
...item,
63+
subject: item.email.subject,
64+
sent_to: item.sent_to.join(', '),
65+
created: localDateTime,
66+
};
67+
});
6268
}
6369
return tableData;
6470
}

src/components/bulk-email-tool/bulk-email-task-manager/BulkEmailTaskHistory.jsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,17 @@ function BulkEmailTaskHistory({ intl }) {
4141
setShowHistoricalTaskContentTable(true);
4242
}
4343

44+
function transformDataForTable() {
45+
let tableData = [];
46+
if (emailTaskHistoryData) {
47+
tableData = emailTaskHistoryData.map((item) => ({
48+
...item,
49+
created: new Date(item.created).toLocaleString(),
50+
}));
51+
}
52+
return tableData;
53+
}
54+
4455
const tableColumns = [
4556
{
4657
Header: `${intl.formatMessage(messages.taskHistoryTableColumnHeaderTaskType)}`,
@@ -95,7 +106,7 @@ function BulkEmailTaskHistory({ intl }) {
95106
{showHistoricalTaskContentTable ? (
96107
<BulkEmailTaskManagerTable
97108
errorRetrievingData={errorRetrievingData}
98-
tableData={emailTaskHistoryData}
109+
tableData={transformDataForTable()}
99110
alertWarningMessage={intl.formatMessage(messages.noTaskHistoryData)}
100111
alertErrorMessage={intl.formatMessage(messages.errorFetchingTaskHistoryData)}
101112
columns={tableColumns}

0 commit comments

Comments
 (0)