coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Document history event headings (#2433)

Browse Source 
* fix: Document history events from last year but within 12 months shown as 'this year'
fix: Events older than a year have repeated headings

* lint
This commit is contained in:
Tom Moor
2021-08-12 18:24:13 -04:00
committed by GitHub
parent 4cbae1cf7d
commit 77db0c2e95
5 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/utils/dates.js
View File

@ -4,14 +4,20 @@ import {
isYesterday,
differenceInCalendarWeeks,
differenceInCalendarMonths,
differenceInCalendarYears,
format as formatDate,
} from "date-fns";
import * as React from "react";
import { type TFunction } from "react-i18next";
import LocaleTime from "components/LocaleTime";
import { dateLocale } from "utils/i18n";
export function dateToHeading(dateTime: string, t: TFunction) {
export function dateToHeading(
dateTime: string,
t: TFunction,
userLocale: ?string
) {
const date = Date.parse(dateTime);
const now = new Date();
const locale = dateLocale(userLocale);
if (isToday(date)) {
return t("Today");
@ -26,7 +32,7 @@ export function dateToHeading(dateTime: string, t: TFunction) {
// async bundle loading of languages
const weekDiff = differenceInCalendarWeeks(now, date);
if (weekDiff === 0) {
return <LocaleTime dateTime={dateTime} tooltip={false} format="iiii" />;
return formatDate(Date.parse(dateTime), "iiii", { locale });
}
if (weekDiff === 1) {
@ -42,10 +48,11 @@ export function dateToHeading(dateTime: string, t: TFunction) {
return t("Last month");
}
if (monthDiff <= 12) {
const yearDiff = differenceInCalendarYears(now, date);
if (yearDiff === 0) {
return t("This year");
}
// If older than the current calendar year then just print the year e.g 2020
return <LocaleTime dateTime={dateTime} tooltip={false} format="y" />;
return formatDate(Date.parse(dateTime), "y", { locale });
}