Skip to content

Commit

Permalink
CMS-603: Convert timestamp in change logs to local time when formatti…
Browse files Browse the repository at this point in the history
…ng. (#72)
  • Loading branch information
diego-oxd authored Jan 6, 2025
1 parent 09981c0 commit 50ae5ea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion frontend/src/components/ChangeLogsList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export default function ChangeLogsList({ changeLogs = [] }) {
)}
<span className="note-metadata">
{changeLog.notes ? "" : "Submitted "}
{formatDate(changeLog.createdAt)} by {changeLog.user.name}
{formatDate(changeLog.createdAt, "America/Vancouver")} by{" "}
{changeLog.user.name}
</span>
</p>
))}
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,19 @@ export function normalizeToUTCDate(dateObject) {
* Formats an ISO date string into a human-readable string
* @param {string} isoString ISO date string
* @param {string} formatString date-fns formatting string
* @param {string} timezone timezone to format the date in
* @returns {string} The formatted date string
*/
function isoToFormattedString(isoString, formatString) {
function isoToFormattedString(isoString, formatString, timezone = "UTC") {
if (!isoString) return "";

const date = parseISO(isoString);

return formatInTimeZone(date, "UTC", formatString);
return formatInTimeZone(date, timezone, formatString);
}

export function formatDate(date) {
return isoToFormattedString(date, DATE_FORMAT_DEFAULT);
export function formatDate(date, timezone = "UTC") {
return isoToFormattedString(date, DATE_FORMAT_DEFAULT, timezone);
}

export function formatDateShort(date) {
Expand Down

0 comments on commit 50ae5ea

Please sign in to comment.