mirror of
https://github.com/SomboChea/ui
synced 2026-01-18 09:06:14 +07:00
refactor: replaced date fns with dayjs (#345)
This commit is contained in:
committed by
Juan Picado @jotadeveloper
parent
474e9e18de
commit
501845b5f8
@@ -71,7 +71,7 @@ describe('formatDateDistance', (): void => {
|
||||
const date2 = dateTwoMonthsAgo();
|
||||
// FIXME: we need to review this expect, fails every x time.
|
||||
// expect(formatDateDistance(date1)).toEqual('about 2 months');
|
||||
expect(formatDateDistance(date2)).toEqual('2 months');
|
||||
expect(formatDateDistance(date2)).toEqual('2 months ago');
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -2,12 +2,15 @@ import { isObject } from 'util';
|
||||
|
||||
import { UpLinks } from '@verdaccio/types';
|
||||
import isString from 'lodash/isString';
|
||||
import format from 'date-fns/format';
|
||||
import formatDistanceToNow from 'date-fns/formatDistanceToNow';
|
||||
import dayjs from 'dayjs';
|
||||
import relativeTime from 'dayjs/plugin/relativeTime';
|
||||
|
||||
import { Time } from '../../types/packageMeta';
|
||||
|
||||
export const TIMEFORMAT = 'dd.MM.yyyy, HH:mm:ss';
|
||||
export const TIMEFORMAT = 'DD.MM.YYYY, HH:mm:ss';
|
||||
|
||||
dayjs.extend(relativeTime);
|
||||
|
||||
/**
|
||||
* Formats license field for webui.
|
||||
@@ -52,11 +55,11 @@ export function formatRepository(repository: any): string | null {
|
||||
}
|
||||
|
||||
export function formatDate(lastUpdate: string | number): string {
|
||||
return format(new Date(lastUpdate), TIMEFORMAT);
|
||||
return dayjs(new Date(lastUpdate)).format('DD.MM.YYYY, HH:mm:ss');
|
||||
}
|
||||
|
||||
export function formatDateDistance(lastUpdate: Date | string | number): string {
|
||||
return formatDistanceToNow(new Date(lastUpdate));
|
||||
return dayjs(new Date(lastUpdate)).fromNow();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user