self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-02-15 19:36:04 +02:00
Code Issues Releases Activity

fix(web): correctly format future timeline dates (#11506)

Browse Source
This commit is contained in:
Michel Heusschen 2024-08-01 13:39:26 +02:00 committed by GitHub
parent 1f0f880ecb
commit 3afb5b497f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/src/lib/utils/timeline-util.spec.ts
View File

@ -1,3 +1,4 @@
import { parseUtcDate } from '$lib/utils/date-time';
import { formatGroupTitle } from '$lib/utils/timeline-util'; import { formatGroupTitle } from '$lib/utils/timeline-util';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
@ -12,35 +13,46 @@ describe('formatGroupTitle', () => {
}); });
it('formats today', () => { it('formats today', () => {
const date = DateTime.fromISO('2024-07-27T01:00:00Z'); const date = parseUtcDate('2024-07-27T01:00:00Z');
expect(formatGroupTitle(date.setLocale('en'))).toBe('today'); expect(formatGroupTitle(date.setLocale('en'))).toBe('today');
expect(formatGroupTitle(date.setLocale('es'))).toBe('hoy'); expect(formatGroupTitle(date.setLocale('es'))).toBe('hoy');
}); });
it('formats yesterday', () => { it('formats yesterday', () => {
const date = DateTime.fromISO('2024-07-26T23:59:59Z'); const date = parseUtcDate('2024-07-26T23:59:59Z');
expect(formatGroupTitle(date.setLocale('en'))).toBe('yesterday'); expect(formatGroupTitle(date.setLocale('en'))).toBe('yesterday');
expect(formatGroupTitle(date.setLocale('fr'))).toBe('hier'); expect(formatGroupTitle(date.setLocale('fr'))).toBe('hier');
}); });
it('formats last week', () => { it('formats last week', () => {
const date = DateTime.fromISO('2024-07-21T00:00:00Z'); const date = parseUtcDate('2024-07-21T00:00:00Z');
expect(formatGroupTitle(date.setLocale('en'))).toBe('Sunday'); expect(formatGroupTitle(date.setLocale('en'))).toBe('Sunday');
expect(formatGroupTitle(date.setLocale('ar-SA'))).toBe('الأحد'); expect(formatGroupTitle(date.setLocale('ar-SA'))).toBe('الأحد');
}); });
it('formats date 7 days ago', () => { it('formats date 7 days ago', () => {
const date = DateTime.fromISO('2024-07-20T00:00:00Z'); const date = parseUtcDate('2024-07-20T00:00:00Z');
expect(formatGroupTitle(date.setLocale('en'))).toBe('Sat, Jul 20'); expect(formatGroupTitle(date.setLocale('en'))).toBe('Sat, Jul 20');
expect(formatGroupTitle(date.setLocale('de'))).toBe('Sa., 20. Juli'); expect(formatGroupTitle(date.setLocale('de'))).toBe('Sa., 20. Juli');
}); });
it('formats date this year', () => { it('formats date this year', () => {
const date = DateTime.fromISO('2020-01-01T00:00:00Z'); const date = parseUtcDate('2020-01-01T00:00:00Z');
expect(formatGroupTitle(date.setLocale('en'))).toBe('Wed, Jan 1, 2020'); expect(formatGroupTitle(date.setLocale('en'))).toBe('Wed, Jan 1, 2020');
expect(formatGroupTitle(date.setLocale('ja'))).toBe('2020年1月1日(水)'); expect(formatGroupTitle(date.setLocale('ja'))).toBe('2020年1月1日(水)');
}); });
it('formats future date', () => {
const tomorrow = parseUtcDate('2024-07-28T00:00:00Z');
expect(formatGroupTitle(tomorrow.setLocale('en'))).toBe('Sun, Jul 28');
const nextMonth = parseUtcDate('2024-08-28T00:00:00Z');
expect(formatGroupTitle(nextMonth.setLocale('en'))).toBe('Wed, Aug 28');
const nextYear = parseUtcDate('2025-01-10T12:00:00Z');
expect(formatGroupTitle(nextYear.setLocale('en'))).toBe('Fri, Jan 10, 2025');
});
it('returns "Invalid DateTime" when date is invalid', () => { it('returns "Invalid DateTime" when date is invalid', () => {
const date = DateTime.invalid('test'); const date = DateTime.invalid('test');
expect(formatGroupTitle(date.setLocale('en'))).toBe('Invalid DateTime'); expect(formatGroupTitle(date.setLocale('en'))).toBe('Invalid DateTime');

2
web/src/lib/utils/timeline-util.ts
View File

@ -32,7 +32,7 @@ export function formatGroupTitle(_date: DateTime): string {
} }
// Last week // Last week
if (date >= today.minus({ days: 6 })) { if (date >= today.minus({ days: 6 }) && date < today) {
return date.toLocaleString({ weekday: 'long' }); return date.toLocaleString({ weekday: 'long' });
} }