Move date components and helpers to shlink-web-component

This commit is contained in:
Alejandro Celaya 2023-07-31 18:10:34 +02:00
parent 8d24116859
commit bc11e568b9
49 changed files with 138 additions and 98 deletions

View file

@ -9,13 +9,13 @@ import { useEffect, useState } from 'react';
import { Button, FormGroup, Input, Row } from 'reactstrap'; import { Button, FormGroup, Input, Row } from 'reactstrap';
import type { InputType } from 'reactstrap/types/lib/Input'; import type { InputType } from 'reactstrap/types/lib/Input';
import { Checkbox } from '../../src/utils/Checkbox'; import { Checkbox } from '../../src/utils/Checkbox';
import type { DateTimeInputProps } from '../../src/utils/dates/DateTimeInput';
import { DateTimeInput } from '../../src/utils/dates/DateTimeInput';
import { formatIsoDate } from '../../src/utils/helpers/date';
import { IconInput } from '../../src/utils/IconInput'; import { IconInput } from '../../src/utils/IconInput';
import { SimpleCard } from '../../src/utils/SimpleCard'; import { SimpleCard } from '../../src/utils/SimpleCard';
import type { DomainSelectorProps } from '../domains/DomainSelector'; import type { DomainSelectorProps } from '../domains/DomainSelector';
import type { TagsSelectorProps } from '../tags/helpers/TagsSelector'; import type { TagsSelectorProps } from '../tags/helpers/TagsSelector';
import type { DateTimeInputProps } from '../utils/dates/DateTimeInput';
import { DateTimeInput } from '../utils/dates/DateTimeInput';
import { formatIsoDate } from '../utils/dates/helpers/date';
import { useFeature } from '../utils/features'; import { useFeature } from '../utils/features';
import { handleEventPreventingDefault, hasValue } from '../utils/helpers'; import { handleEventPreventingDefault, hasValue } from '../utils/helpers';
import type { DeviceLongUrls, ShortUrlData } from './data'; import type { DeviceLongUrls, ShortUrlData } from './data';

View file

@ -4,14 +4,14 @@ import classNames from 'classnames';
import { isEmpty, pipe } from 'ramda'; import { isEmpty, pipe } from 'ramda';
import type { FC } from 'react'; import type { FC } from 'react';
import { Button, InputGroup, Row, UncontrolledTooltip } from 'reactstrap'; import { Button, InputGroup, Row, UncontrolledTooltip } from 'reactstrap';
import { DateRangeSelector } from '../../src/utils/dates/DateRangeSelector';
import { formatIsoDate } from '../../src/utils/helpers/date';
import type { DateRange } from '../../src/utils/helpers/dateIntervals';
import { datesToDateRange } from '../../src/utils/helpers/dateIntervals';
import type { OrderDir } from '../../src/utils/helpers/ordering'; import type { OrderDir } from '../../src/utils/helpers/ordering';
import { OrderingDropdown } from '../../src/utils/OrderingDropdown'; import { OrderingDropdown } from '../../src/utils/OrderingDropdown';
import { SearchField } from '../../src/utils/SearchField'; import { SearchField } from '../../src/utils/SearchField';
import type { TagsSelectorProps } from '../tags/helpers/TagsSelector'; import type { TagsSelectorProps } from '../tags/helpers/TagsSelector';
import { DateRangeSelector } from '../utils/dates/DateRangeSelector';
import { formatIsoDate } from '../utils/dates/helpers/date';
import type { DateRange } from '../utils/dates/helpers/dateIntervals';
import { datesToDateRange } from '../utils/dates/helpers/dateIntervals';
import { useFeature } from '../utils/features'; import { useFeature } from '../utils/features';
import { useSetting } from '../utils/settings'; import { useSetting } from '../utils/settings';
import type { ShortUrlsOrder, ShortUrlsOrderableFields } from './data'; import type { ShortUrlsOrder, ShortUrlsOrderableFields } from './data';

View file

@ -4,7 +4,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { isBefore } from 'date-fns'; import { isBefore } from 'date-fns';
import type { FC, ReactNode } from 'react'; import type { FC, ReactNode } from 'react';
import { UncontrolledTooltip } from 'reactstrap'; import { UncontrolledTooltip } from 'reactstrap';
import { formatHumanFriendly, now, parseISO } from '../../../src/utils/helpers/date'; import { formatHumanFriendly, now, parseISO } from '../../utils/dates/helpers/date';
import { useElementRef } from '../../utils/helpers/hooks'; import { useElementRef } from '../../utils/helpers/hooks';
import type { ShortUrl } from '../data'; import type { ShortUrl } from '../data';

View file

@ -2,7 +2,7 @@ import { faInfoCircle as infoIcon } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import classNames from 'classnames'; import classNames from 'classnames';
import { UncontrolledTooltip } from 'reactstrap'; import { UncontrolledTooltip } from 'reactstrap';
import { formatHumanFriendly, parseISO } from '../../../src/utils/helpers/date'; import { formatHumanFriendly, parseISO } from '../../utils/dates/helpers/date';
import { useElementRef } from '../../utils/helpers/hooks'; import { useElementRef } from '../../utils/helpers/hooks';
import { prettify } from '../../utils/helpers/numbers'; import { prettify } from '../../utils/helpers/numbers';
import type { ShortUrl } from '../data'; import type { ShortUrl } from '../data';

View file

@ -1,9 +1,9 @@
import type { FC } from 'react'; import type { FC } from 'react';
import { useEffect, useRef } from 'react'; import { useEffect, useRef } from 'react';
import { ExternalLink } from 'react-external-link'; import { ExternalLink } from 'react-external-link';
import { Time } from '../../../src/utils/dates/Time';
import type { TimeoutToggle } from '../../../src/utils/helpers/hooks'; import type { TimeoutToggle } from '../../../src/utils/helpers/hooks';
import { CopyToClipboardIcon } from '../../utils/components/CopyToClipboardIcon'; import { CopyToClipboardIcon } from '../../utils/components/CopyToClipboardIcon';
import { Time } from '../../utils/dates/Time';
import type { ColorGenerator } from '../../utils/services/ColorGenerator'; import type { ColorGenerator } from '../../utils/services/ColorGenerator';
import { useSetting } from '../../utils/settings'; import { useSetting } from '../../utils/settings';
import type { ShortUrl } from '../data'; import type { ShortUrl } from '../data';

View file

@ -1,5 +1,5 @@
@import '../mixins/vertical-align'; @import '../../../src/utils/mixins/vertical-align';
@import '../base'; @import '../../../src/utils/base';
.react-datepicker__close-icon.react-datepicker__close-icon { .react-datepicker__close-icon.react-datepicker__close-icon {
@include vertical-align(); @include vertical-align();

View file

@ -5,7 +5,7 @@ import { isNil } from 'ramda';
import { useRef } from 'react'; import { useRef } from 'react';
import type { ReactDatePickerProps } from 'react-datepicker'; import type { ReactDatePickerProps } from 'react-datepicker';
import DatePicker from 'react-datepicker'; import DatePicker from 'react-datepicker';
import { STANDARD_DATE_FORMAT } from '../helpers/date'; import { STANDARD_DATE_FORMAT } from './helpers/date';
import './DateInput.scss'; import './DateInput.scss';
export type DateInputProps = ReactDatePickerProps; export type DateInputProps = ReactDatePickerProps;

View file

@ -1,7 +1,7 @@
import type { FC } from 'react'; import type { FC } from 'react';
import { DropdownItem } from 'reactstrap'; import { DropdownItem } from 'reactstrap';
import type { DateInterval } from '../helpers/dateIntervals'; import type { DateInterval } from './helpers/dateIntervals';
import { DATE_INTERVALS, rangeOrIntervalToString } from '../helpers/dateIntervals'; import { DATE_INTERVALS, rangeOrIntervalToString } from './helpers/dateIntervals';
export interface DateIntervalDropdownProps { export interface DateIntervalDropdownProps {
active?: DateInterval; active?: DateInterval;

View file

@ -0,0 +1,11 @@
import type { FC } from 'react';
import { DropdownBtn } from '../../../src/utils/DropdownBtn';
import type { DateIntervalDropdownProps } from './DateIntervalDropdownItems';
import { DateIntervalDropdownItems } from './DateIntervalDropdownItems';
import { rangeOrIntervalToString } from './helpers/dateIntervals';
export const DateIntervalSelector: FC<DateIntervalDropdownProps> = ({ onChange, active, allText }) => (
<DropdownBtn text={rangeOrIntervalToString(active) ?? allText}>
<DateIntervalDropdownItems allText={allText} active={active} onChange={onChange} />
</DropdownBtn>
);

View file

@ -1,6 +1,6 @@
import { endOfDay } from 'date-fns'; import { endOfDay } from 'date-fns';
import type { DateRange } from '../helpers/dateIntervals';
import { DateInput } from './DateInput'; import { DateInput } from './DateInput';
import type { DateRange } from './helpers/dateIntervals';
interface DateRangeRowProps extends DateRange { interface DateRangeRowProps extends DateRange {
onStartDateChange: (date: Date | null) => void; onStartDateChange: (date: Date | null) => void;

View file

@ -1,19 +1,19 @@
import { useState } from 'react'; import { useState } from 'react';
import { DropdownItem } from 'reactstrap'; import { DropdownItem } from 'reactstrap';
import { DropdownBtn } from '../DropdownBtn'; import { DropdownBtn } from '../../../src/utils/DropdownBtn';
import { useEffectExceptFirstTime } from '../../../src/utils/helpers/hooks';
import { DateIntervalDropdownItems } from './DateIntervalDropdownItems';
import { DateRangeRow } from './DateRangeRow';
import type { import type {
DateInterval, DateInterval,
DateRange } from '../helpers/dateIntervals'; DateRange } from './helpers/dateIntervals';
import { import {
ALL, ALL,
dateRangeIsEmpty, dateRangeIsEmpty,
intervalToDateRange, intervalToDateRange,
rangeIsInterval, rangeIsInterval,
rangeOrIntervalToString, rangeOrIntervalToString,
} from '../helpers/dateIntervals'; } from './helpers/dateIntervals';
import { useEffectExceptFirstTime } from '../helpers/hooks';
import { DateIntervalDropdownItems } from './DateIntervalDropdownItems';
import { DateRangeRow } from './DateRangeRow';
export interface DateRangeSelectorProps { export interface DateRangeSelectorProps {
initialDateRange?: DateInterval | DateRange; initialDateRange?: DateInterval | DateRange;

View file

@ -1,7 +1,7 @@
import type { FC } from 'react'; import type { FC } from 'react';
import type { ReactDatePickerProps } from 'react-datepicker'; import type { ReactDatePickerProps } from 'react-datepicker';
import { STANDARD_DATE_AND_TIME_FORMAT } from '../helpers/date';
import { DateInput } from './DateInput'; import { DateInput } from './DateInput';
import { STANDARD_DATE_AND_TIME_FORMAT } from './helpers/date';
export type DateTimeInputProps = Omit<ReactDatePickerProps, 'showTimeSelect' | 'dateFormat' | 'timeIntervals'>; export type DateTimeInputProps = Omit<ReactDatePickerProps, 'showTimeSelect' | 'dateFormat' | 'timeIntervals'>;

View file

@ -1,5 +1,5 @@
import { format as formatDate, formatDistance, getUnixTime, parseISO } from 'date-fns'; import { format as formatDate, formatDistance, getUnixTime, parseISO } from 'date-fns';
import { isDateObject, now, STANDARD_DATE_AND_TIME_FORMAT } from '../helpers/date'; import { isDateObject, now, STANDARD_DATE_AND_TIME_FORMAT } from './helpers/date';
export interface TimeProps { export interface TimeProps {
date: Date | string; date: Date | string;

View file

@ -1,5 +1,5 @@
import { format, formatISO, isBefore, isEqual, isWithinInterval, parse, parseISO as stdParseISO } from 'date-fns'; import { format, formatISO, isBefore, isEqual, isWithinInterval, parse, parseISO as stdParseISO } from 'date-fns';
import type { OptionalString } from '../utils'; import type { OptionalString } from '../../../../src/utils/utils';
export const STANDARD_DATE_FORMAT = 'yyyy-MM-dd'; export const STANDARD_DATE_FORMAT = 'yyyy-MM-dd';
@ -21,23 +21,16 @@ const formatDateFromFormat = (date?: NullableDate, theFormat?: string): Optional
return theFormat ? format(date, theFormat) : formatISO(date); return theFormat ? format(date, theFormat) : formatISO(date);
}; };
export const formatDate = (theFormat = STANDARD_DATE_FORMAT) => (date?: NullableDate) => formatDateFromFormat(
date,
theFormat,
);
export const formatIsoDate = (date?: NullableDate) => formatDateFromFormat(date, undefined); export const formatIsoDate = (date?: NullableDate) => formatDateFromFormat(date, undefined);
export const formatInternational = formatDate(); export const formatInternational = (date?: NullableDate) => formatDateFromFormat(date, STANDARD_DATE_FORMAT);
export const formatHumanFriendly = formatDate(STANDARD_DATE_AND_TIME_FORMAT); export const formatHumanFriendly = (date?: NullableDate) => formatDateFromFormat(date, STANDARD_DATE_AND_TIME_FORMAT);
export const parseDate = (date: string, theFormat: string) => parse(date, theFormat, now()); export const parseDate = (date: string, theFormat: string) => parse(date, theFormat, now());
export const parseISO = (date: DateOrString): Date => (isDateObject(date) ? date : stdParseISO(date)); export const parseISO = (date: DateOrString): Date => (isDateObject(date) ? date : stdParseISO(date));
export const dateOrNull = (date?: string): Date | null => (date ? parseISO(date) : null);
export const isBetween = (date: DateOrString, start?: DateOrString, end?: DateOrString): boolean => { export const isBetween = (date: DateOrString, start?: DateOrString, end?: DateOrString): boolean => {
try { try {
return isWithinInterval(parseISO(date), { start: parseISO(start ?? date), end: parseISO(end ?? date) }); return isWithinInterval(parseISO(date), { start: parseISO(start ?? date), end: parseISO(end ?? date) });

View file

@ -1,7 +1,7 @@
import { endOfDay, startOfDay, subDays } from 'date-fns'; import { endOfDay, startOfDay, subDays } from 'date-fns';
import { cond, filter, isEmpty, T } from 'ramda'; import { cond, filter, isEmpty, T } from 'ramda';
import type { DateOrString } from './date'; import type { DateOrString } from './date';
import { dateOrNull, formatInternational, isBeforeOrEqual, now, parseISO } from './date'; import { formatInternational, isBeforeOrEqual, now, parseISO } from './date';
export interface DateRange { export interface DateRange {
startDate?: Date | null; startDate?: Date | null;
@ -30,7 +30,9 @@ export const dateRangeIsEmpty = (dateRange?: DateRange): boolean => dateRange ==
export const rangeIsInterval = (range?: DateRange | DateInterval): range is DateInterval => export const rangeIsInterval = (range?: DateRange | DateInterval): range is DateInterval =>
typeof range === 'string' && INTERVALS.includes(range); typeof range === 'string' && INTERVALS.includes(range);
export const DATE_INTERVALS = INTERVALS.filter((value) => value !== ALL) as DateInterval[]; export const DATE_INTERVALS = INTERVALS.filter((value) => value !== ALL) as Exclude<DateInterval, typeof ALL>[];
const dateOrNull = (date?: string): Date | null => (date ? parseISO(date) : null);
export const datesToDateRange = (startDate?: string, endDate?: string): DateRange => ({ export const datesToDateRange = (startDate?: string, endDate?: string): DateRange => ({
startDate: dateOrNull(startDate), startDate: dateOrNull(startDate),

View file

@ -1,8 +1,8 @@
import { createContext, useContext } from 'react'; import { createContext, useContext } from 'react';
import type { DateInterval } from '../../src/utils/helpers/dateIntervals';
import type { Theme } from '../../src/utils/theme'; import type { Theme } from '../../src/utils/theme';
import type { ShortUrlsOrder } from '../short-urls/data'; import type { ShortUrlsOrder } from '../short-urls/data';
import type { TagsOrder } from '../tags/data/TagsListChildrenProps'; import type { TagsOrder } from '../tags/data/TagsListChildrenProps';
import type { DateInterval } from './dates/helpers/dateIntervals';
export const DEFAULT_SHORT_URLS_ORDERING: ShortUrlsOrder = { export const DEFAULT_SHORT_URLS_ORDERING: ShortUrlsOrder = {
field: 'dateCreated', field: 'dateCreated',

View file

@ -1,7 +1,7 @@
import { ExternalLink } from 'react-external-link'; import { ExternalLink } from 'react-external-link';
import { UncontrolledTooltip } from 'reactstrap'; import { UncontrolledTooltip } from 'reactstrap';
import { Time } from '../../src/utils/dates/Time';
import type { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail'; import type { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail';
import { Time } from '../utils/dates/Time';
import type { ShortUrlVisits } from './reducers/shortUrlVisits'; import type { ShortUrlVisits } from './reducers/shortUrlVisits';
import { VisitsHeader } from './VisitsHeader'; import { VisitsHeader } from './VisitsHeader';
import './ShortUrlVisitsHeader.scss'; import './ShortUrlVisitsHeader.scss';

View file

@ -7,14 +7,14 @@ import type { FC, PropsWithChildren } from 'react';
import { useEffect, useMemo, useRef, useState } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react';
import { Navigate, Route, Routes, useLocation } from 'react-router-dom'; import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
import { Button, Progress, Row } from 'reactstrap'; import { Button, Progress, Row } from 'reactstrap';
import { DateRangeSelector } from '../../src/utils/dates/DateRangeSelector';
import type { DateInterval, DateRange } from '../../src/utils/helpers/dateIntervals';
import { toDateRange } from '../../src/utils/helpers/dateIntervals';
import { Message } from '../../src/utils/Message'; import { Message } from '../../src/utils/Message';
import { NavPillItem, NavPills } from '../../src/utils/NavPills'; import { NavPillItem, NavPills } from '../../src/utils/NavPills';
import { Result } from '../../src/utils/Result'; import { Result } from '../../src/utils/Result';
import { ShlinkApiError } from '../common/ShlinkApiError'; import { ShlinkApiError } from '../common/ShlinkApiError';
import { ExportBtn } from '../utils/components/ExportBtn'; import { ExportBtn } from '../utils/components/ExportBtn';
import { DateRangeSelector } from '../utils/dates/DateRangeSelector';
import type { DateInterval, DateRange } from '../utils/dates/helpers/dateIntervals';
import { toDateRange } from '../utils/dates/helpers/dateIntervals';
import { prettify } from '../utils/helpers/numbers'; import { prettify } from '../utils/helpers/numbers';
import { useSetting } from '../utils/settings'; import { useSetting } from '../utils/settings';
import { DoughnutChartCard } from './charts/DoughnutChartCard'; import { DoughnutChartCard } from './charts/DoughnutChartCard';

View file

@ -4,11 +4,11 @@ import classNames from 'classnames';
import { min, splitEvery } from 'ramda'; import { min, splitEvery } from 'ramda';
import { useEffect, useMemo, useRef, useState } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react';
import { UncontrolledTooltip } from 'reactstrap'; import { UncontrolledTooltip } from 'reactstrap';
import { Time } from '../../src/utils/dates/Time';
import type { Order } from '../../src/utils/helpers/ordering'; import type { Order } from '../../src/utils/helpers/ordering';
import { determineOrderDir, sortList } from '../../src/utils/helpers/ordering'; import { determineOrderDir, sortList } from '../../src/utils/helpers/ordering';
import { SearchField } from '../../src/utils/SearchField'; import { SearchField } from '../../src/utils/SearchField';
import { SimplePaginator } from '../utils/components/SimplePaginator'; import { SimplePaginator } from '../utils/components/SimplePaginator';
import { Time } from '../utils/dates/Time';
import { prettify } from '../utils/helpers/numbers'; import { prettify } from '../utils/helpers/numbers';
import { TableOrderIcon } from '../utils/table/TableOrderIcon'; import { TableOrderIcon } from '../utils/table/TableOrderIcon';
import type { MediaMatcher } from '../utils/types'; import type { MediaMatcher } from '../utils/types';

View file

@ -23,9 +23,9 @@ import {
DropdownToggle, DropdownToggle,
UncontrolledDropdown, UncontrolledDropdown,
} from 'reactstrap'; } from 'reactstrap';
import { STANDARD_DATE_FORMAT } from '../../../src/utils/helpers/date';
import { HIGHLIGHTED_COLOR, MAIN_COLOR } from '../../../src/utils/theme'; import { HIGHLIGHTED_COLOR, MAIN_COLOR } from '../../../src/utils/theme';
import { ToggleSwitch } from '../../../src/utils/ToggleSwitch'; import { ToggleSwitch } from '../../../src/utils/ToggleSwitch';
import { formatInternational } from '../../utils/dates/helpers/date';
import { rangeOf } from '../../utils/helpers'; import { rangeOf } from '../../utils/helpers';
import { pointerOnHover, renderChartLabel } from '../../utils/helpers/charts'; import { pointerOnHover, renderChartLabel } from '../../utils/helpers/charts';
import { useToggle } from '../../utils/helpers/hooks'; import { useToggle } from '../../utils/helpers/hooks';
@ -67,10 +67,16 @@ const STEP_TO_DIFF_FUNC_MAP: Record<Step, (dateLeft: Date, dateRight: Date) => n
const STEP_TO_DATE_FORMAT: Record<Step, (date: Date) => string> = { const STEP_TO_DATE_FORMAT: Record<Step, (date: Date) => string> = {
hourly: (date) => format(date, 'yyyy-MM-dd HH:00'), hourly: (date) => format(date, 'yyyy-MM-dd HH:00'),
daily: (date) => format(date, STANDARD_DATE_FORMAT), // TODO Fix formatInternational return type
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
daily: (date) => formatInternational(date)!,
weekly(date) { weekly(date) {
const firstWeekDay = format(startOfISOWeek(date), STANDARD_DATE_FORMAT); // TODO Fix formatInternational return type
const lastWeekDay = format(endOfISOWeek(date), STANDARD_DATE_FORMAT); // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const firstWeekDay = formatInternational(startOfISOWeek(date))!;
// TODO Fix formatInternational return type
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const lastWeekDay = formatInternational(endOfISOWeek(date))!;
return `${firstWeekDay} - ${lastWeekDay}`; return `${firstWeekDay} - ${lastWeekDay}`;
}, },

View file

@ -2,9 +2,9 @@ import type { DeepPartial } from '@reduxjs/toolkit';
import { isEmpty, isNil, mergeDeepRight, pipe } from 'ramda'; import { isEmpty, isNil, mergeDeepRight, pipe } from 'ramda';
import { useMemo } from 'react'; import { useMemo } from 'react';
import { useLocation, useNavigate } from 'react-router-dom'; import { useLocation, useNavigate } from 'react-router-dom';
import { formatIsoDate } from '../../../src/utils/helpers/date'; import { formatIsoDate } from '../../utils/dates/helpers/date';
import type { DateRange } from '../../../src/utils/helpers/dateIntervals'; import type { DateRange } from '../../utils/dates/helpers/dateIntervals';
import { datesToDateRange } from '../../../src/utils/helpers/dateIntervals'; import { datesToDateRange } from '../../utils/dates/helpers/dateIntervals';
import type { BooleanString } from '../../utils/helpers'; import type { BooleanString } from '../../utils/helpers';
import { parseBooleanToString } from '../../utils/helpers'; import { parseBooleanToString } from '../../utils/helpers';
import { parseQuery, stringifyQuery } from '../../utils/helpers/query'; import { parseQuery, stringifyQuery } from '../../utils/helpers/query';

View file

@ -1,10 +1,10 @@
import { createAction, createSlice } from '@reduxjs/toolkit'; import { createAction, createSlice } from '@reduxjs/toolkit';
import { flatten, prop, range, splitEvery } from 'ramda'; import { flatten, prop, range, splitEvery } from 'ramda';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals';
import { dateToMatchingInterval } from '../../../src/utils/helpers/dateIntervals';
import type { ShlinkPaginator, ShlinkVisits, ShlinkVisitsParams } from '../../api-contract'; import type { ShlinkPaginator, ShlinkVisits, ShlinkVisitsParams } from '../../api-contract';
import { parseApiError } from '../../api-contract/utils'; import { parseApiError } from '../../api-contract/utils';
import type { RootState } from '../../container/store'; import type { RootState } from '../../container/store';
import type { DateInterval } from '../../utils/dates/helpers/dateIntervals';
import { dateToMatchingInterval } from '../../utils/dates/helpers/dateIntervals';
import { createAsyncThunk } from '../../utils/redux'; import { createAsyncThunk } from '../../utils/redux';
import type { CreateVisit, Visit } from '../types'; import type { CreateVisit, Visit } from '../types';
import type { LoadVisits, VisitsInfo, VisitsLoaded } from './types'; import type { LoadVisits, VisitsInfo, VisitsLoaded } from './types';

View file

@ -1,6 +1,6 @@
import { isBetween } from '../../../src/utils/helpers/date';
import type { ShlinkApiClient } from '../../api-contract'; import type { ShlinkApiClient } from '../../api-contract';
import { domainMatches } from '../../short-urls/helpers'; import { domainMatches } from '../../short-urls/helpers';
import { isBetween } from '../../utils/dates/helpers/date';
import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common'; import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common';
import type { LoadVisits, VisitsInfo } from './types'; import type { LoadVisits, VisitsInfo } from './types';

View file

@ -1,5 +1,5 @@
import { isBetween } from '../../../src/utils/helpers/date';
import type { ShlinkApiClient } from '../../api-contract'; import type { ShlinkApiClient } from '../../api-contract';
import { isBetween } from '../../utils/dates/helpers/date';
import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common'; import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common';
import type { VisitsInfo } from './types'; import type { VisitsInfo } from './types';

View file

@ -1,5 +1,5 @@
import { isBetween } from '../../../src/utils/helpers/date';
import type { ShlinkApiClient } from '../../api-contract'; import type { ShlinkApiClient } from '../../api-contract';
import { isBetween } from '../../utils/dates/helpers/date';
import type { OrphanVisit, OrphanVisitType } from '../types'; import type { OrphanVisit, OrphanVisitType } from '../types';
import { isOrphanVisit } from '../types/helpers'; import { isOrphanVisit } from '../types/helpers';
import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common'; import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common';

View file

@ -1,7 +1,7 @@
import { isBetween } from '../../../src/utils/helpers/date';
import type { ShlinkApiClient } from '../../api-contract'; import type { ShlinkApiClient } from '../../api-contract';
import type { ShortUrlIdentifier } from '../../short-urls/data'; import type { ShortUrlIdentifier } from '../../short-urls/data';
import { shortUrlMatches } from '../../short-urls/helpers'; import { shortUrlMatches } from '../../short-urls/helpers';
import { isBetween } from '../../utils/dates/helpers/date';
import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common'; import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common';
import type { LoadVisits, VisitsInfo } from './types'; import type { LoadVisits, VisitsInfo } from './types';

View file

@ -1,5 +1,5 @@
import { isBetween } from '../../../src/utils/helpers/date';
import type { ShlinkApiClient } from '../../api-contract'; import type { ShlinkApiClient } from '../../api-contract';
import { isBetween } from '../../utils/dates/helpers/date';
import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common'; import { createVisitsAsyncThunk, createVisitsReducer, lastVisitLoaderForLoader } from './common';
import type { LoadVisits, VisitsInfo } from './types'; import type { LoadVisits, VisitsInfo } from './types';

View file

@ -1,5 +1,5 @@
import type { DateInterval } from '../../../../src/utils/helpers/dateIntervals';
import type { ProblemDetailsError, ShlinkVisitsParams } from '../../../api-contract'; import type { ProblemDetailsError, ShlinkVisitsParams } from '../../../api-contract';
import type { DateInterval } from '../../../utils/dates/helpers/dateIntervals';
import type { Visit } from '../../types'; import type { Visit } from '../../types';
export interface VisitsInfo { export interface VisitsInfo {

View file

@ -1,6 +1,6 @@
import { countBy, groupBy, pipe, prop } from 'ramda'; import { countBy, groupBy, pipe, prop } from 'ramda';
import type { ShlinkVisitsParams } from '../../../api/types'; import type { ShlinkVisitsParams } from '../../../api/types';
import { formatIsoDate } from '../../../src/utils/helpers/date'; import { formatIsoDate } from '../../utils/dates/helpers/date';
import type { CreateVisit, NormalizedOrphanVisit, NormalizedVisit, OrphanVisit, Stats, Visit, VisitsParams } from './index'; import type { CreateVisit, NormalizedOrphanVisit, NormalizedVisit, OrphanVisit, Stats, Visit, VisitsParams } from './index';
export const isOrphanVisit = (visit: Visit): visit is OrphanVisit => (visit as OrphanVisit).visitedUrl !== undefined; export const isOrphanVisit = (visit: Visit): visit is OrphanVisit => (visit as OrphanVisit).visitedUrl !== undefined;

View file

@ -1,5 +1,5 @@
import type { DateRange } from '../../../src/utils/helpers/dateIntervals';
import type { ShortUrl } from '../../short-urls/data'; import type { ShortUrl } from '../../short-urls/data';
import type { DateRange } from '../../utils/dates/helpers/dateIntervals';
export type OrphanVisitType = 'base_url' | 'invalid_short_url' | 'regular_404'; export type OrphanVisitType = 'base_url' | 'invalid_short_url' | 'regular_404';

View file

@ -1,10 +1,10 @@
import type { FC } from 'react'; import type { FC } from 'react';
import { FormGroup } from 'reactstrap'; import { FormGroup } from 'reactstrap';
import type { Settings } from '../../shlink-web-component/utils/settings'; import type { Settings } from '../../shlink-web-component';
import type { DateInterval } from '../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { DateIntervalSelector } from '../utils/dates/DateIntervalSelector'; import { DateIntervalSelector } from '../utils/dates/DateIntervalSelector';
import { FormText } from '../utils/forms/FormText'; import { FormText } from '../utils/forms/FormText';
import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup'; import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup';
import type { DateInterval } from '../utils/helpers/dateIntervals';
import { SimpleCard } from '../utils/SimpleCard'; import { SimpleCard } from '../utils/SimpleCard';
import { ToggleSwitch } from '../utils/ToggleSwitch'; import { ToggleSwitch } from '../utils/ToggleSwitch';

View file

@ -1,11 +1,39 @@
import type { FC } from 'react'; import type { FC } from 'react';
import { DropdownItem } from 'reactstrap';
import type { Settings } from '../../../shlink-web-component';
import { rangeOrIntervalToString } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { DropdownBtn } from '../DropdownBtn'; import { DropdownBtn } from '../DropdownBtn';
import { rangeOrIntervalToString } from '../helpers/dateIntervals';
import type { DateIntervalDropdownProps } from './DateIntervalDropdownItems';
import { DateIntervalDropdownItems } from './DateIntervalDropdownItems';
export const DateIntervalSelector: FC<DateIntervalDropdownProps> = ({ onChange, active, allText }) => ( type DateInterval = Exclude<Settings['visits'], undefined>['defaultInterval'];
export interface DateIntervalSelectorProps {
active?: DateInterval;
allText: string;
onChange: (interval: DateInterval) => void;
}
const INTERVAL_TO_STRING_MAP: Record<Exclude<DateInterval, 'all'>, string> = {
today: 'Today',
yesterday: 'Yesterday',
last7Days: 'Last 7 days',
last30Days: 'Last 30 days',
last90Days: 'Last 90 days',
last180Days: 'Last 180 days',
last365Days: 'Last 365 days',
};
export const DateIntervalSelector: FC<DateIntervalSelectorProps> = ({ onChange, active, allText }) => (
<DropdownBtn text={rangeOrIntervalToString(active) ?? allText}> <DropdownBtn text={rangeOrIntervalToString(active) ?? allText}>
<DateIntervalDropdownItems allText={allText} active={active} onChange={onChange} /> <DropdownItem active={active === 'all'} onClick={() => onChange('all')}>
{allText}
</DropdownItem>
<DropdownItem divider />
{Object.entries(INTERVAL_TO_STRING_MAP).map(
([interval, name]) => (
<DropdownItem key={interval} active={active === interval} onClick={() => onChange(interval as DateInterval)}>
{name}
</DropdownItem>
),
)}
</DropdownBtn> </DropdownBtn>
); );

View file

@ -4,8 +4,8 @@ import { fromPartial } from '@total-typescript/shoehorn';
import { formatISO } from 'date-fns'; import { formatISO } from 'date-fns';
import type { Mode } from '../../shlink-web-component/short-urls/ShortUrlForm'; import type { Mode } from '../../shlink-web-component/short-urls/ShortUrlForm';
import { ShortUrlForm as createShortUrlForm } from '../../shlink-web-component/short-urls/ShortUrlForm'; import { ShortUrlForm as createShortUrlForm } from '../../shlink-web-component/short-urls/ShortUrlForm';
import { parseDate } from '../../shlink-web-component/utils/dates/helpers/date';
import type { ReachableServer, SelectedServer } from '../../src/servers/data'; import type { ReachableServer, SelectedServer } from '../../src/servers/data';
import { parseDate } from '../../src/utils/helpers/date';
import type { OptionalString } from '../../src/utils/utils'; import type { OptionalString } from '../../src/utils/utils';
import { renderWithEvents } from '../__helpers__/setUpTest'; import { renderWithEvents } from '../__helpers__/setUpTest';

View file

@ -3,9 +3,9 @@ import { fromPartial } from '@total-typescript/shoehorn';
import { endOfDay, formatISO, startOfDay } from 'date-fns'; import { endOfDay, formatISO, startOfDay } from 'date-fns';
import { MemoryRouter, useLocation, useNavigate } from 'react-router-dom'; import { MemoryRouter, useLocation, useNavigate } from 'react-router-dom';
import { ShortUrlsFilteringBar as filteringBarCreator } from '../../shlink-web-component/short-urls/ShortUrlsFilteringBar'; import { ShortUrlsFilteringBar as filteringBarCreator } from '../../shlink-web-component/short-urls/ShortUrlsFilteringBar';
import { formatDate } from '../../shlink-web-component/utils/dates/helpers/date';
import type { DateRange } from '../../shlink-web-component/utils/dates/helpers/dateIntervals';
import type { ReachableServer, SelectedServer } from '../../src/servers/data'; import type { ReachableServer, SelectedServer } from '../../src/servers/data';
import { formatDate } from '../../src/utils/helpers/date';
import type { DateRange } from '../../src/utils/helpers/dateIntervals';
import { renderWithEvents } from '../__helpers__/setUpTest'; import { renderWithEvents } from '../__helpers__/setUpTest';
vi.mock('react-router-dom', async () => ({ vi.mock('react-router-dom', async () => ({

View file

@ -5,9 +5,9 @@ import { last } from 'ramda';
import { MemoryRouter, useLocation } from 'react-router-dom'; import { MemoryRouter, useLocation } from 'react-router-dom';
import type { ShortUrl, ShortUrlMeta } from '../../../shlink-web-component/short-urls/data'; import type { ShortUrl, ShortUrlMeta } from '../../../shlink-web-component/short-urls/data';
import { ShortUrlsRow as createShortUrlsRow } from '../../../shlink-web-component/short-urls/helpers/ShortUrlsRow'; import { ShortUrlsRow as createShortUrlsRow } from '../../../shlink-web-component/short-urls/helpers/ShortUrlsRow';
import { now, parseDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import type { ReachableServer } from '../../../src/servers/data'; import type { ReachableServer } from '../../../src/servers/data';
import type { Settings } from '../../../src/settings/reducers/settings'; import type { Settings } from '../../../src/settings/reducers/settings';
import { now, parseDate } from '../../../src/utils/helpers/date';
import type { TimeoutToggle } from '../../../src/utils/helpers/hooks'; import type { TimeoutToggle } from '../../../src/utils/helpers/hooks';
import type { OptionalString } from '../../../src/utils/utils'; import type { OptionalString } from '../../../src/utils/utils';
import { renderWithEvents } from '../../__helpers__/setUpTest'; import { renderWithEvents } from '../../__helpers__/setUpTest';

View file

@ -1,8 +1,8 @@
import { screen, waitFor } from '@testing-library/react'; import { screen, waitFor } from '@testing-library/react';
import { fromPartial } from '@total-typescript/shoehorn'; import { fromPartial } from '@total-typescript/shoehorn';
import { parseISO } from 'date-fns'; import { parseISO } from 'date-fns';
import type { DateInputProps } from '../../../src/utils/dates/DateInput'; import type { DateInputProps } from '../../../shlink-web-component/utils/dates/DateInput';
import { DateInput } from '../../../src/utils/dates/DateInput'; import { DateInput } from '../../../shlink-web-component/utils/dates/DateInput';
import { renderWithEvents } from '../../__helpers__/setUpTest'; import { renderWithEvents } from '../../__helpers__/setUpTest';
describe('<DateInput />', () => { describe('<DateInput />', () => {

View file

@ -1,8 +1,8 @@
import { screen, waitFor } from '@testing-library/react'; import { screen, waitFor } from '@testing-library/react';
import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { DATE_INTERVALS, rangeOrIntervalToString } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { DateIntervalDropdownItems } from '../../../src/utils/dates/DateIntervalDropdownItems'; import { DateIntervalDropdownItems } from '../../../src/utils/dates/DateIntervalDropdownItems';
import { DropdownBtn } from '../../../src/utils/DropdownBtn'; import { DropdownBtn } from '../../../src/utils/DropdownBtn';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals';
import { DATE_INTERVALS, rangeOrIntervalToString } from '../../../src/utils/helpers/dateIntervals';
import { renderWithEvents } from '../../__helpers__/setUpTest'; import { renderWithEvents } from '../../__helpers__/setUpTest';
describe('<DateIntervalDropdownItems />', () => { describe('<DateIntervalDropdownItems />', () => {

View file

@ -1,7 +1,7 @@
import { screen, waitFor } from '@testing-library/react'; import { screen, waitFor } from '@testing-library/react';
import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { rangeOrIntervalToString } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { DateIntervalSelector } from '../../../src/utils/dates/DateIntervalSelector'; import { DateIntervalSelector } from '../../../src/utils/dates/DateIntervalSelector';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals';
import { rangeOrIntervalToString } from '../../../src/utils/helpers/dateIntervals';
import { renderWithEvents } from '../../__helpers__/setUpTest'; import { renderWithEvents } from '../../__helpers__/setUpTest';
describe('<DateIntervalSelector />', () => { describe('<DateIntervalSelector />', () => {

View file

@ -1,5 +1,5 @@
import { screen } from '@testing-library/react'; import { screen } from '@testing-library/react';
import { DateRangeRow } from '../../../src/utils/dates/DateRangeRow'; import { DateRangeRow } from '../../../shlink-web-component/utils/dates/DateRangeRow';
import { renderWithEvents } from '../../__helpers__/setUpTest'; import { renderWithEvents } from '../../__helpers__/setUpTest';
describe('<DateRangeRow />', () => { describe('<DateRangeRow />', () => {

View file

@ -1,8 +1,8 @@
import { screen, waitFor } from '@testing-library/react'; import { screen, waitFor } from '@testing-library/react';
import { fromPartial } from '@total-typescript/shoehorn'; import { fromPartial } from '@total-typescript/shoehorn';
import type { DateRangeSelectorProps } from '../../../src/utils/dates/DateRangeSelector'; import type { DateRangeSelectorProps } from '../../../shlink-web-component/utils/dates/DateRangeSelector';
import { DateRangeSelector } from '../../../src/utils/dates/DateRangeSelector'; import { DateRangeSelector } from '../../../shlink-web-component/utils/dates/DateRangeSelector';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals'; import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { renderWithEvents } from '../../__helpers__/setUpTest'; import { renderWithEvents } from '../../__helpers__/setUpTest';
describe('<DateRangeSelector />', () => { describe('<DateRangeSelector />', () => {

View file

@ -1,7 +1,7 @@
import { render } from '@testing-library/react'; import { render } from '@testing-library/react';
import type { TimeProps } from '../../../src/utils/dates/Time'; import { parseDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import { Time } from '../../../src/utils/dates/Time'; import type { TimeProps } from '../../../shlink-web-component/utils/dates/Time';
import { parseDate } from '../../../src/utils/helpers/date'; import { Time } from '../../../shlink-web-component/utils/dates/Time';
describe('<Time />', () => { describe('<Time />', () => {
const setUp = (props: TimeProps) => render(<Time {...props} />); const setUp = (props: TimeProps) => render(<Time {...props} />);

View file

@ -1,5 +1,5 @@
import { addDays, formatISO, subDays } from 'date-fns'; import { addDays, formatISO, subDays } from 'date-fns';
import { formatDate, formatIsoDate, isBeforeOrEqual, isBetween, parseDate } from '../../../src/utils/helpers/date'; import { formatDate, formatIsoDate, isBeforeOrEqual, isBetween, parseDate } from '../../../shlink-web-component/utils/dates/helpers/date';
describe('date', () => { describe('date', () => {
const now = new Date(); const now = new Date();

View file

@ -1,7 +1,7 @@
import { endOfDay, format, formatISO, startOfDay, subDays } from 'date-fns'; import { endOfDay, format, formatISO, startOfDay, subDays } from 'date-fns';
import { now, parseDate } from '../../../src/utils/helpers/date'; import { now, parseDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import type { import type {
DateInterval } from '../../../src/utils/helpers/dateIntervals'; DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { import {
dateRangeIsEmpty, dateRangeIsEmpty,
dateToMatchingInterval, dateToMatchingInterval,
@ -9,7 +9,7 @@ import {
rangeIsInterval, rangeIsInterval,
rangeOrIntervalToString, rangeOrIntervalToString,
toDateRange, toDateRange,
} from '../../../src/utils/helpers/dateIntervals'; } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
describe('date-types', () => { describe('date-types', () => {
const daysBack = (days: number) => subDays(now(), days); const daysBack = (days: number) => subDays(now(), days);

View file

@ -1,6 +1,8 @@
import { fromPartial } from '@total-typescript/shoehorn'; import { fromPartial } from '@total-typescript/shoehorn';
import { addDays, formatISO, subDays } from 'date-fns'; import { addDays, formatISO, subDays } from 'date-fns';
import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; import type { ShortUrl } from '../../../shlink-web-component/short-urls/data';
import { formatIsoDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import type { import type {
DomainVisits, LoadDomainVisits, DomainVisits, LoadDomainVisits,
} from '../../../shlink-web-component/visits/reducers/domainVisits'; } from '../../../shlink-web-component/visits/reducers/domainVisits';
@ -14,8 +16,6 @@ import type { Visit } from '../../../shlink-web-component/visits/types';
import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
import type { ShlinkVisits } from '../../../src/api/types'; import type { ShlinkVisits } from '../../../src/api/types';
import type { ShlinkState } from '../../../src/container/types'; import type { ShlinkState } from '../../../src/container/types';
import { formatIsoDate } from '../../../src/utils/helpers/date';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals';
import { rangeOf } from '../../../src/utils/utils'; import { rangeOf } from '../../../src/utils/utils';
describe('domainVisitsReducer', () => { describe('domainVisitsReducer', () => {

View file

@ -1,5 +1,7 @@
import { fromPartial } from '@total-typescript/shoehorn'; import { fromPartial } from '@total-typescript/shoehorn';
import { addDays, formatISO, subDays } from 'date-fns'; import { addDays, formatISO, subDays } from 'date-fns';
import { formatIsoDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { import {
getNonOrphanVisits as getNonOrphanVisitsCreator, getNonOrphanVisits as getNonOrphanVisitsCreator,
nonOrphanVisitsReducerCreator, nonOrphanVisitsReducerCreator,
@ -10,8 +12,6 @@ import type { Visit } from '../../../shlink-web-component/visits/types';
import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
import type { ShlinkVisits } from '../../../src/api/types'; import type { ShlinkVisits } from '../../../src/api/types';
import type { ShlinkState } from '../../../src/container/types'; import type { ShlinkState } from '../../../src/container/types';
import { formatIsoDate } from '../../../src/utils/helpers/date';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals';
import { rangeOf } from '../../../src/utils/utils'; import { rangeOf } from '../../../src/utils/utils';
describe('nonOrphanVisitsReducer', () => { describe('nonOrphanVisitsReducer', () => {

View file

@ -1,5 +1,7 @@
import { fromPartial } from '@total-typescript/shoehorn'; import { fromPartial } from '@total-typescript/shoehorn';
import { addDays, formatISO, subDays } from 'date-fns'; import { addDays, formatISO, subDays } from 'date-fns';
import { formatIsoDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import { import {
getOrphanVisits as getOrphanVisitsCreator, getOrphanVisits as getOrphanVisitsCreator,
orphanVisitsReducerCreator, orphanVisitsReducerCreator,
@ -10,8 +12,6 @@ import type { Visit } from '../../../shlink-web-component/visits/types';
import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
import type { ShlinkVisits } from '../../../src/api/types'; import type { ShlinkVisits } from '../../../src/api/types';
import type { ShlinkState } from '../../../src/container/types'; import type { ShlinkState } from '../../../src/container/types';
import { formatIsoDate } from '../../../src/utils/helpers/date';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals';
import { rangeOf } from '../../../src/utils/utils'; import { rangeOf } from '../../../src/utils/utils';
describe('orphanVisitsReducer', () => { describe('orphanVisitsReducer', () => {

View file

@ -1,5 +1,7 @@
import { fromPartial } from '@total-typescript/shoehorn'; import { fromPartial } from '@total-typescript/shoehorn';
import { addDays, formatISO, subDays } from 'date-fns'; import { addDays, formatISO, subDays } from 'date-fns';
import { formatIsoDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import type { import type {
ShortUrlVisits } from '../../../shlink-web-component/visits/reducers/shortUrlVisits'; ShortUrlVisits } from '../../../shlink-web-component/visits/reducers/shortUrlVisits';
import { import {
@ -11,8 +13,6 @@ import type { Visit } from '../../../shlink-web-component/visits/types';
import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
import type { ShlinkVisits } from '../../../src/api/types'; import type { ShlinkVisits } from '../../../src/api/types';
import type { ShlinkState } from '../../../src/container/types'; import type { ShlinkState } from '../../../src/container/types';
import { formatIsoDate } from '../../../src/utils/helpers/date';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals';
import { rangeOf } from '../../../src/utils/utils'; import { rangeOf } from '../../../src/utils/utils';
describe('shortUrlVisitsReducer', () => { describe('shortUrlVisitsReducer', () => {

View file

@ -1,5 +1,7 @@
import { fromPartial } from '@total-typescript/shoehorn'; import { fromPartial } from '@total-typescript/shoehorn';
import { addDays, formatISO, subDays } from 'date-fns'; import { addDays, formatISO, subDays } from 'date-fns';
import { formatIsoDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals';
import type { import type {
TagVisits } from '../../../shlink-web-component/visits/reducers/tagVisits'; TagVisits } from '../../../shlink-web-component/visits/reducers/tagVisits';
import { import {
@ -11,8 +13,6 @@ import type { Visit } from '../../../shlink-web-component/visits/types';
import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
import type { ShlinkVisits } from '../../../src/api/types'; import type { ShlinkVisits } from '../../../src/api/types';
import type { ShlinkState } from '../../../src/container/types'; import type { ShlinkState } from '../../../src/container/types';
import { formatIsoDate } from '../../../src/utils/helpers/date';
import type { DateInterval } from '../../../src/utils/helpers/dateIntervals';
import { rangeOf } from '../../../src/utils/utils'; import { rangeOf } from '../../../src/utils/utils';
describe('tagVisitsReducer', () => { describe('tagVisitsReducer', () => {

View file

@ -1,9 +1,9 @@
import { fromPartial } from '@total-typescript/shoehorn'; import { fromPartial } from '@total-typescript/shoehorn';
import { formatIsoDate, parseDate } from '../../../shlink-web-component/utils/dates/helpers/date';
import type { CreateVisit, OrphanVisit, VisitsParams } from '../../../shlink-web-component/visits/types'; import type { CreateVisit, OrphanVisit, VisitsParams } from '../../../shlink-web-component/visits/types';
import type { GroupedNewVisits } from '../../../shlink-web-component/visits/types/helpers'; import type { GroupedNewVisits } from '../../../shlink-web-component/visits/types/helpers';
import { groupNewVisitsByType, toApiParams } from '../../../shlink-web-component/visits/types/helpers'; import { groupNewVisitsByType, toApiParams } from '../../../shlink-web-component/visits/types/helpers';
import type { ShlinkVisitsParams } from '../../../src/api/types'; import type { ShlinkVisitsParams } from '../../../src/api/types';
import { formatIsoDate, parseDate } from '../../../src/utils/helpers/date';
describe('visitsTypeHelpers', () => { describe('visitsTypeHelpers', () => {
describe('groupNewVisitsByType', () => { describe('groupNewVisitsByType', () => {