Remove Luxon from codebase (#14448)
Fixes #14444 We shouldn't have 2 libraries to manage dates, one is enough
This commit is contained in:
+5
-13
@@ -1,4 +1,4 @@
|
||||
import { DateTime } from 'luxon';
|
||||
import { formatISO, parseISO, subDays, subHours } from 'date-fns';
|
||||
|
||||
import { type BlocklistItem } from '@/accounts/types/BlocklistItem';
|
||||
|
||||
@@ -8,9 +8,7 @@ export const mockedBlocklist: BlocklistItem[] = [
|
||||
handle: 'test1@twenty.com',
|
||||
workspaceMemberId: '1',
|
||||
createdAt:
|
||||
DateTime.fromISO('2023-04-26T10:12:42.33625+00:00')
|
||||
.minus({ hours: 2 })
|
||||
.toISO() ?? '',
|
||||
formatISO(subHours(parseISO('2023-04-26T10:12:42.33625+00:00'), 2)) ?? '',
|
||||
__typename: 'BlocklistItem',
|
||||
},
|
||||
{
|
||||
@@ -18,9 +16,7 @@ export const mockedBlocklist: BlocklistItem[] = [
|
||||
handle: 'test2@twenty.com',
|
||||
workspaceMemberId: '1',
|
||||
createdAt:
|
||||
DateTime.fromISO('2023-04-26T10:12:42.33625+00:00')
|
||||
.minus({ days: 2 })
|
||||
.toISO() ?? '',
|
||||
formatISO(subDays(parseISO('2023-04-26T10:12:42.33625+00:00'), 2)) ?? '',
|
||||
__typename: 'BlocklistItem',
|
||||
},
|
||||
{
|
||||
@@ -28,9 +24,7 @@ export const mockedBlocklist: BlocklistItem[] = [
|
||||
handle: 'test3@twenty.com',
|
||||
workspaceMemberId: '1',
|
||||
createdAt:
|
||||
DateTime.fromISO('2023-04-26T10:12:42.33625+00:00')
|
||||
.minus({ days: 3 })
|
||||
.toISO() ?? '',
|
||||
formatISO(subDays(parseISO('2023-04-26T10:12:42.33625+00:00'), 3)) ?? '',
|
||||
__typename: 'BlocklistItem',
|
||||
},
|
||||
{
|
||||
@@ -38,9 +32,7 @@ export const mockedBlocklist: BlocklistItem[] = [
|
||||
handle: '@twenty.com',
|
||||
workspaceMemberId: '1',
|
||||
createdAt:
|
||||
DateTime.fromISO('2023-04-26T10:12:42.33625+00:00')
|
||||
.minus({ days: 4 })
|
||||
.toISO() ?? '',
|
||||
formatISO(subDays(parseISO('2023-04-26T10:12:42.33625+00:00'), 4)) ?? '',
|
||||
__typename: 'BlocklistItem',
|
||||
},
|
||||
];
|
||||
|
||||
+5
-5
@@ -1,4 +1,4 @@
|
||||
import { DateTime } from 'luxon';
|
||||
import { differenceInDays, parseISO, addDays } from 'date-fns';
|
||||
|
||||
export const computeNewExpirationDate = (
|
||||
expiresAt: string | null | undefined,
|
||||
@@ -7,8 +7,8 @@ export const computeNewExpirationDate = (
|
||||
if (!expiresAt) {
|
||||
return null;
|
||||
}
|
||||
const days = DateTime.fromISO(expiresAt).diff(DateTime.fromISO(createdAt), [
|
||||
'days',
|
||||
]).days;
|
||||
return DateTime.utc().plus({ days }).toISO();
|
||||
const expirationDate = parseISO(expiresAt);
|
||||
const creationDate = parseISO(createdAt);
|
||||
const days = differenceInDays(expirationDate, creationDate);
|
||||
return addDays(new Date(), days).toISOString();
|
||||
};
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
import { t } from '@lingui/core/macro';
|
||||
import { isNonEmptyString } from '@sniptt/guards';
|
||||
import { DateTime } from 'luxon';
|
||||
import { differenceInYears, parseISO } from 'date-fns';
|
||||
|
||||
import { NEVER_EXPIRE_DELTA_IN_YEARS } from '@/settings/developers/constants/NeverExpireDeltaInYears';
|
||||
import { beautifyDateDiff } from '~/utils/date-utils';
|
||||
|
||||
export const doesNeverExpire = (expiresAt: string) => {
|
||||
const dateDiff = DateTime.fromISO(expiresAt).diff(DateTime.now(), [
|
||||
'years',
|
||||
'days',
|
||||
]);
|
||||
return dateDiff.years > NEVER_EXPIRE_DELTA_IN_YEARS / 10;
|
||||
const expirationDate = parseISO(expiresAt);
|
||||
const now = new Date();
|
||||
const yearsDiff = differenceInYears(expirationDate, now);
|
||||
return yearsDiff > NEVER_EXPIRE_DELTA_IN_YEARS / 10;
|
||||
};
|
||||
|
||||
export const isExpired = (expiresAt: string | null) => {
|
||||
|
||||
Reference in New Issue
Block a user