forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-02-28 04:36:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added test for toDateRange helper function

Browse Source
This commit is contained in:
Alejandro Celaya
2022-12-03 12:45:25 +01:00
parent e5185f2099
commit 5bd89efc09
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/dates/DateRangeSelector.tsx
View File

@@ -25,7 +25,9 @@ export const DateRangeSelector = (
{ onDatesChange, initialDateRange, defaultText, disabled, updatable = false }: DateRangeSelectorProps,
) => {
const initialIntervalIsRange = rangeIsInterval(initialDateRange);
const [activeInterval, setActiveInterval] = useState(initialIntervalIsRange ? initialDateRange : undefined);
const [activeInterval, setActiveInterval] = useState<DateInterval | undefined>(
initialIntervalIsRange ? initialDateRange : undefined,
);
const [activeDateRange, setActiveDateRange] = useState(initialIntervalIsRange ? undefined : initialDateRange);
const updateDateRange = (dateRange: DateRange) => {

30
src/utils/helpers/dateIntervals.ts
View File

@@ -7,14 +7,8 @@ export interface DateRange {
endDate?: Date | null;
}
export type DateInterval = 'all' | 'today' | 'yesterday' | 'last7Days' | 'last30Days' | 'last90Days' | 'last180Days' | 'last365Days';
export const dateRangeIsEmpty = (dateRange?: DateRange): boolean => dateRange === undefined
|| isEmpty(filter(Boolean, dateRange as any));
export const rangeIsInterval = (range?: DateRange | DateInterval): range is DateInterval => typeof range === 'string';
const INTERVAL_TO_STRING_MAP: Record<DateInterval, string | undefined> = {
const ALL = 'all';
const INTERVAL_TO_STRING_MAP = {
today: 'Today',
yesterday: 'Yesterday',
last7Days: 'Last 7 days',
@@ -22,10 +16,20 @@ const INTERVAL_TO_STRING_MAP: Record<DateInterval, string | undefined> = {
last90Days: 'Last 90 days',
last180Days: 'Last 180 days',
last365Days: 'Last 365 days',
all: undefined,
[ALL]: undefined,
};
export const DATE_INTERVALS = Object.keys(INTERVAL_TO_STRING_MAP).filter((value) => value !== 'all') as DateInterval[];
export type DateInterval = keyof typeof INTERVAL_TO_STRING_MAP;
const INTERVALS = Object.keys(INTERVAL_TO_STRING_MAP) as DateInterval[];
export const dateRangeIsEmpty = (dateRange?: DateRange): boolean => dateRange === undefined
|| isEmpty(filter(Boolean, dateRange as any));
export const rangeIsInterval = (range?: DateRange | DateInterval): range is DateInterval =>
typeof range === 'string' && INTERVALS.includes(range);
export const DATE_INTERVALS = INTERVALS.filter((value) => value !== ALL) as DateInterval[];
export const datesToDateRange = (startDate?: string, endDate?: string): DateRange => ({
startDate: dateOrNull(startDate),
@@ -49,7 +53,7 @@ const dateRangeToString = (range?: DateRange): string | undefined => {
};
export const rangeOrIntervalToString = (range?: DateRange | DateInterval): string | undefined => {
if (!range || range === 'all') {
if (!range || range === ALL) {
return undefined;
}
@@ -64,7 +68,7 @@ const startOfDaysAgo = (daysAgo: number) => startOfDay(subDays(new Date(), daysA
const endingToday = (startDate: Date): DateRange => ({ startDate, endDate: endOfDay(new Date()) });
export const intervalToDateRange = (dateInterval?: DateInterval): DateRange => {
if (!dateInterval || dateInterval === 'all') {
if (!dateInterval || dateInterval === ALL) {
return {};
}
@@ -99,7 +103,7 @@ export const dateToMatchingInterval = (date: DateOrString): DateInterval => {
[() => isBeforeOrEqual(startOfDaysAgo(90), theDate), () => 'last90Days'],
[() => isBeforeOrEqual(startOfDaysAgo(180), theDate), () => 'last180Days'],
[() => isBeforeOrEqual(startOfDaysAgo(365), theDate), () => 'last365Days'],
[T, () => 'all'],
[T, () => ALL],
])();
};