Skip to content

fix(site): fix locale dates in timeline component #9223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2023
Merged

fix(site): fix locale dates in timeline component #9223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions site/src/components/Timeline/TimelineDateRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
import { makeStyles } from "@mui/styles"
import TableCell from "@mui/material/TableCell"
import TableRow from "@mui/material/TableRow"
import formatRelative from "date-fns/formatRelative"
import { FC } from "react"
import { createDisplayDate } from "./utils"

export interface TimelineDateRow {
date: Date
}

// We only want the message related to the date since the time is displayed
// inside of the build row
export const createDisplayDate = (date: Date, base = new Date()): string =>
formatRelative(date, base).split(" at ")[0]

export const TimelineDateRow: FC<TimelineDateRow> = ({ date }) => {
const styles = useStyles()

Expand Down
2 changes: 1 addition & 1 deletion ...src/components/Timeline/Timeline.test.tsx → site/src/components/Timeline/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createDisplayDate } from "./TimelineDateRow"
import { createDisplayDate } from "./utils"

describe("createDisplayDate", () => {
it("returns correctly for Saturdays", () => {
Expand Down
15 changes: 15 additions & 0 deletions site/src/components/Timeline/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* eslint-disable eslint-comments/disable-enable-pair -- Solve below */
/* eslint-disable import/no-duplicates -- https://github.com/date-fns/date-fns/issues/1677 */
import formatRelative from "date-fns/formatRelative"
import subDays from "date-fns/subDays"

export const createDisplayDate = (
date: Date,
base: Date = new Date(),
): string => {
const lastWeek = subDays(base, 7)
if (date >= lastWeek) {
return formatRelative(date, base).split(" at ")[0]
}
return date.toLocaleDateString()
}