Commit 21ff8dc

committed

Merge branch '335-ui-date-format' into 'master'

fix(ui): support both date formats in UI: custom and RFC3339 (#335) Closes #335 See merge request postgres-ai/database-lab!510

2 parents 1953123 + 9d0d9a7 commit 21ff8dcCopy full SHA for 21ff8dc

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*--------------------------------------------------------------------------`
`6`	`6`	`*/`
`7`	`7`
`8`		`-import { parseISO9075Date } from '@postgres.ai/shared/utils/date'`
	`8`	`+import { parseDate } from '@postgres.ai/shared/utils/date'`
`9`	`9`	`import {`
`10`	`10`	`SnapshotDto,`
`11`	`11`	`formatSnapshotDto,`
`@@ -35,7 +35,7 @@ export type CloneDto = {`
`35`	`35`	`export const formatCloneDto = (dto: CloneDto) => ({`
`36`	`36`	`...dto,`
`37`	`37`	`createdAt: dto.createdAt,`
`38`		`- createdAtDate: parseISO9075Date(dto.createdAt),`
	`38`	`+ createdAtDate: parseDate(dto.createdAt),`
`39`	`39`	`snapshot: dto.snapshot ? formatSnapshotDto(dto.snapshot) : null,`
`40`	`40`	`})`
`41`	`41`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { parseISO9075Date } from '@postgres.ai/shared/utils/date'`
	`1`	`+import { parseDate } from '@postgres.ai/shared/utils/date'`
`2`	`2`
`3`	`3`	`export type SnapshotDto = {`
`4`	`4`	`createdAt: string`
`@@ -11,8 +11,8 @@ export type SnapshotDto = {`
`11`	`11`
`12`	`12`	`export const formatSnapshotDto = (dto: SnapshotDto) => ({`
`13`	`13`	`...dto,`
`14`		`- createdAtDate: parseISO9075Date(dto.createdAt),`
`15`		`- dataStateAtDate: parseISO9075Date(dto.dataStateAt)`
	`14`	`+ createdAtDate: parseDate(dto.createdAt),`
	`15`	`+ dataStateAtDate: parseDate(dto.dataStateAt)`
`16`	`16`	`})`
`17`	`17`
`18`	`18`	`export type Snapshot = ReturnType<typeof formatSnapshotDto>`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ import {`
`21`	`21`	`formatDistanceToNowStrict,`
`22`	`22`	`} from 'date-fns'`
`23`	`23`
`24`		`-export const parseISO9075Date = (dateStr: string) =>`
`25`		`- parse(dateStr.replace('UTC', 'Z'), 'yyyy-MM-dd HH:mm:ss X', new Date())`
	`24`	+// parseDate parses date of both format: '2006年01月02日 15:04:05 UTC' and `2006年01月02日T15:04:05Z` (RFC3339).
	`25`	`+export const parseDate = (dateStr: string) =>`
	`26`	`+ parse(dateStr.replace(' UTC', 'Z').replace('T', ' '), 'yyyy-MM-dd HH:mm:ssX', new Date())`
`26`	`27`
`27`	`28`	`// UTCf - UTC formatted, but not actually UTC.`
`28`	`29`	`// date-fns using this approach because browser don't have an opportunity to switch single date`

Comments

(0)