From 1d60db25bd29f86a40c3771a5b736d72e0fbb704 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 28 May 2022 11:16:59 +0200 Subject: [PATCH] Removed all default export except for services and reducers --- src/domains/ManageDomains.tsx | 2 +- src/servers/helpers/ServerError.tsx | 2 +- src/servers/helpers/withSelectedServer.tsx | 2 +- src/servers/services/ServersExporter.ts | 2 +- src/settings/Settings.tsx | 4 +--- src/settings/services/provideServices.ts | 2 +- src/short-urls/CreateShortUrl.tsx | 7 ++++--- src/short-urls/EditShortUrl.tsx | 2 +- src/short-urls/Paginator.tsx | 4 +--- src/short-urls/ShortUrlForm.tsx | 2 +- src/short-urls/ShortUrlsList.tsx | 6 ++---- src/short-urls/helpers/CreateShortUrlResult.tsx | 4 +--- src/short-urls/helpers/DeleteShortUrlModal.tsx | 4 +--- src/short-urls/helpers/QrCodeModal.tsx | 4 +--- src/short-urls/helpers/ShortUrlDetailLink.tsx | 5 +---- src/short-urls/helpers/ShortUrlVisitsCount.tsx | 8 ++++---- src/short-urls/helpers/ShortUrlsRow.tsx | 10 ++++------ src/short-urls/helpers/ShortUrlsRowMenu.tsx | 6 ++---- src/short-urls/services/provideServices.ts | 14 +++++++------- src/tags/TagCard.tsx | 8 +++----- src/tags/TagsList.tsx | 2 +- src/tags/TagsTableRow.tsx | 4 ++-- src/tags/helpers/DeleteTagConfirmModal.tsx | 4 +--- src/tags/helpers/EditTagModal.tsx | 6 ++---- src/tags/helpers/Tag.tsx | 6 ++---- src/tags/helpers/TagBullet.tsx | 6 ++---- src/tags/helpers/TagsSelector.tsx | 10 ++++------ src/tags/reducers/tagEdit.ts | 2 +- src/tags/services/provideServices.ts | 8 ++++---- src/utils/BooleanControl.tsx | 4 +--- src/utils/Checkbox.tsx | 2 +- src/utils/DateInput.tsx | 4 +--- src/utils/Message.tsx | 6 +++--- src/utils/PaginationDropdown.tsx | 4 +--- src/utils/ToggleSwitch.tsx | 2 +- src/utils/dates/DateRangeRow.tsx | 6 ++---- src/utils/dates/DateRangeSelector.tsx | 2 +- src/utils/services/ColorGenerator.ts | 4 ++-- src/utils/services/LocalStorage.ts | 2 +- src/utils/services/provideServices.ts | 4 ++-- src/visits/DomainVisits.tsx | 2 +- src/visits/NonOrphanVisits.tsx | 2 +- src/visits/OrphanVisits.tsx | 2 +- src/visits/ShortUrlVisits.tsx | 6 ++---- src/visits/ShortUrlVisitsHeader.tsx | 6 ++---- src/visits/TagVisits.tsx | 8 +++----- src/visits/TagVisitsHeader.tsx | 11 ++++------- src/visits/VisitsHeader.tsx | 6 ++---- src/visits/VisitsStats.tsx | 6 +++--- src/visits/VisitsTable.tsx | 4 +--- src/visits/charts/SortableBarChartCard.tsx | 2 +- src/visits/helpers/MapModal.tsx | 6 ++---- src/visits/helpers/OpenMapModalBtn.tsx | 6 ++---- src/visits/services/provideServices.ts | 6 +++--- test/servers/services/ServersExporter.test.ts | 2 +- test/settings/Settings.test.tsx | 2 +- test/short-urls/CreateShortUrl.test.tsx | 2 +- test/short-urls/Paginator.test.tsx | 2 +- test/short-urls/ShortUrlForm.test.tsx | 2 +- test/short-urls/ShortUrlsList.test.tsx | 6 +++--- .../helpers/CreateShortUrlResult.test.tsx | 4 ++-- .../helpers/DeleteShortUrlModal.test.tsx | 2 +- test/short-urls/helpers/QrCodeModal.test.tsx | 2 +- .../short-urls/helpers/ShortUrlDetailLink.test.tsx | 2 +- .../helpers/ShortUrlVisitsCount.test.tsx | 2 +- test/short-urls/helpers/ShortUrlsRow.test.tsx | 6 +++--- test/short-urls/helpers/ShortUrlsRowMenu.test.tsx | 2 +- test/tags/TagCard.test.tsx | 6 +++--- test/tags/TagsTableRow.test.tsx | 2 +- test/tags/helpers/DeleteTagConfirmModal.test.tsx | 2 +- test/tags/helpers/EditTagModal.test.tsx | 4 ++-- test/tags/helpers/Tag.test.tsx | 4 ++-- test/tags/helpers/TagsSelector.test.tsx | 4 ++-- test/tags/reducers/tagEdit.test.ts | 2 +- test/utils/DateInput.test.tsx | 2 +- test/utils/Message.test.tsx | 2 +- test/utils/PaginationDropdown.test.tsx | 2 +- test/utils/dates/DateRangeRow.test.tsx | 4 ++-- test/utils/dates/DateRangeSelector.test.tsx | 2 +- test/utils/services/ColorGenerator.test.ts | 4 ++-- .../{Storage.test.ts => LocalStorage.test.ts} | 2 +- test/visits/OrphanVisits.test.tsx | 2 +- test/visits/ShortUrlVisits.test.tsx | 4 ++-- test/visits/ShortUrlVisitsHeader.test.tsx | 2 +- test/visits/TagVisits.test.tsx | 6 +++--- test/visits/TagVisitsHeader.test.tsx | 6 +++--- test/visits/VisitsHeader.test.tsx | 2 +- test/visits/VisitsStats.test.tsx | 4 ++-- test/visits/VisitsTable.test.tsx | 2 +- test/visits/charts/SortableBarChartCard.test.tsx | 2 +- test/visits/helpers/MapModal.test.tsx | 2 +- test/visits/helpers/OpenMapModalBtn.test.tsx | 4 ++-- 92 files changed, 159 insertions(+), 214 deletions(-) rename test/utils/services/{Storage.test.ts => LocalStorage.test.ts} (94%) diff --git a/src/domains/ManageDomains.tsx b/src/domains/ManageDomains.tsx index 3c149dd1..a6170595 100644 --- a/src/domains/ManageDomains.tsx +++ b/src/domains/ManageDomains.tsx @@ -1,5 +1,5 @@ import { FC, useEffect } from 'react'; -import Message from '../utils/Message'; +import { Message } from '../utils/Message'; import { Result } from '../utils/Result'; import { ShlinkApiError } from '../api/ShlinkApiError'; import { SimpleCard } from '../utils/SimpleCard'; diff --git a/src/servers/helpers/ServerError.tsx b/src/servers/helpers/ServerError.tsx index 2906b64d..6f605969 100644 --- a/src/servers/helpers/ServerError.tsx +++ b/src/servers/helpers/ServerError.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; import { Link } from 'react-router-dom'; -import Message from '../../utils/Message'; +import { Message } from '../../utils/Message'; import { ServersListGroup } from '../ServersListGroup'; import { DeleteServerButtonProps } from '../DeleteServerButton'; import { isServerWithId, SelectedServer, ServersMap } from '../data'; diff --git a/src/servers/helpers/withSelectedServer.tsx b/src/servers/helpers/withSelectedServer.tsx index 6c41667e..dcd7e228 100644 --- a/src/servers/helpers/withSelectedServer.tsx +++ b/src/servers/helpers/withSelectedServer.tsx @@ -1,6 +1,6 @@ import { FC, useEffect } from 'react'; import { useParams } from 'react-router-dom'; -import Message from '../../utils/Message'; +import { Message } from '../../utils/Message'; import { isNotFoundServer, SelectedServer } from '../data'; import { NoMenuLayout } from '../../common/NoMenuLayout'; diff --git a/src/servers/services/ServersExporter.ts b/src/servers/services/ServersExporter.ts index 54e2ccf7..df4fa680 100644 --- a/src/servers/services/ServersExporter.ts +++ b/src/servers/services/ServersExporter.ts @@ -1,5 +1,5 @@ import { values } from 'ramda'; -import LocalStorage from '../../utils/services/LocalStorage'; +import { LocalStorage } from '../../utils/services/LocalStorage'; import { ServersMap, serverWithIdToServerData } from '../data'; import { saveCsv } from '../../utils/helpers/files'; import { JsonToCsv } from '../../utils/helpers/csvjson'; diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx index ff4aed50..d1c8fd72 100644 --- a/src/settings/Settings.tsx +++ b/src/settings/Settings.tsx @@ -9,7 +9,7 @@ const SettingsSections: FC<{ items: ReactNode[] }> = ({ items }) => ( ); -const Settings = ( +export const Settings = ( RealTimeUpdates: FC, ShortUrlCreation: FC, ShortUrlsList: FC, @@ -32,5 +32,3 @@ const Settings = ( ); - -export default Settings; diff --git a/src/settings/services/provideServices.ts b/src/settings/services/provideServices.ts index 57870e91..d64b8592 100644 --- a/src/settings/services/provideServices.ts +++ b/src/settings/services/provideServices.ts @@ -1,6 +1,6 @@ import Bottle from 'bottlejs'; import { RealTimeUpdatesSettings } from '../RealTimeUpdatesSettings'; -import Settings from '../Settings'; +import { Settings } from '../Settings'; import { setRealTimeUpdatesInterval, setShortUrlCreationSettings, diff --git a/src/short-urls/CreateShortUrl.tsx b/src/short-urls/CreateShortUrl.tsx index ef9694f4..a13b75cf 100644 --- a/src/short-urls/CreateShortUrl.tsx +++ b/src/short-urls/CreateShortUrl.tsx @@ -33,7 +33,10 @@ const getInitialState = (settings?: ShortUrlCreationSettings): ShortUrlData => ( forwardQuery: settings?.forwardQuery ?? true, }); -const CreateShortUrl = (ShortUrlForm: FC, CreateShortUrlResult: FC) => ({ +export const CreateShortUrl = ( + ShortUrlForm: FC, + CreateShortUrlResult: FC, +) => ({ createShortUrl, shortUrlCreationResult, resetCreateShortUrl, @@ -64,5 +67,3 @@ const CreateShortUrl = (ShortUrlForm: FC, CreateShortUrlResul ); }; - -export default CreateShortUrl; diff --git a/src/short-urls/EditShortUrl.tsx b/src/short-urls/EditShortUrl.tsx index 35a93d04..1eec0bf5 100644 --- a/src/short-urls/EditShortUrl.tsx +++ b/src/short-urls/EditShortUrl.tsx @@ -8,7 +8,7 @@ import { SelectedServer } from '../servers/data'; import { Settings, ShortUrlCreationSettings } from '../settings/reducers/settings'; import { OptionalString } from '../utils/utils'; import { parseQuery } from '../utils/helpers/query'; -import Message from '../utils/Message'; +import { Message } from '../utils/Message'; import { Result } from '../utils/Result'; import { ShlinkApiError } from '../api/ShlinkApiError'; import { useGoBack, useToggle } from '../utils/helpers/hooks'; diff --git a/src/short-urls/Paginator.tsx b/src/short-urls/Paginator.tsx index 8103623f..45c2fd10 100644 --- a/src/short-urls/Paginator.tsx +++ b/src/short-urls/Paginator.tsx @@ -15,7 +15,7 @@ interface PaginatorProps { currentQueryString?: string; } -const Paginator = ({ paginator, serverId, currentQueryString = '' }: PaginatorProps) => { +export const Paginator = ({ paginator, serverId, currentQueryString = '' }: PaginatorProps) => { const { currentPage = 0, pagesCount = 0 } = paginator ?? {}; const urlForPage = (pageNumber: NumberOrEllipsis) => `/server/${serverId}/list-short-urls/${pageNumber}${currentQueryString}`; @@ -49,5 +49,3 @@ const Paginator = ({ paginator, serverId, currentQueryString = '' }: PaginatorPr ); }; - -export default Paginator; diff --git a/src/short-urls/ShortUrlForm.tsx b/src/short-urls/ShortUrlForm.tsx index d8537e27..32b26a0d 100644 --- a/src/short-urls/ShortUrlForm.tsx +++ b/src/short-urls/ShortUrlForm.tsx @@ -3,7 +3,7 @@ import { InputType } from 'reactstrap/types/lib/Input'; import { Button, FormGroup, Input, Row } from 'reactstrap'; import { cond, isEmpty, pipe, replace, trim, T } from 'ramda'; import { parseISO } from 'date-fns'; -import DateInput, { DateInputProps } from '../utils/DateInput'; +import { DateInput, DateInputProps } from '../utils/DateInput'; import { supportsCrawlableVisits, supportsForwardQuery } from '../utils/helpers/features'; import { SimpleCard } from '../utils/SimpleCard'; import { handleEventPreventingDefault, hasValue, OptionalString } from '../utils/utils'; diff --git a/src/short-urls/ShortUrlsList.tsx b/src/short-urls/ShortUrlsList.tsx index b46652ba..6b3f7a82 100644 --- a/src/short-urls/ShortUrlsList.tsx +++ b/src/short-urls/ShortUrlsList.tsx @@ -11,7 +11,7 @@ import { ShlinkShortUrlsListParams } from '../api/types'; import { DEFAULT_SHORT_URLS_ORDERING, Settings } from '../settings/reducers/settings'; import { ShortUrlsList as ShortUrlsListState } from './reducers/shortUrlsList'; import { ShortUrlsTableProps } from './ShortUrlsTable'; -import Paginator from './Paginator'; +import { Paginator } from './Paginator'; import { useShortUrlsQuery } from './helpers/hooks'; import { ShortUrlsOrderableFields } from './data'; import { ShortUrlsFilteringProps } from './ShortUrlsFilteringBar'; @@ -23,7 +23,7 @@ interface ShortUrlsListProps { settings: Settings; } -const ShortUrlsList = ( +export const ShortUrlsList = ( ShortUrlsTable: FC, ShortUrlsFilteringBar: FC, ) => boundToMercureHub(({ listShortUrls, shortUrlsList, selectedServer, settings }: ShortUrlsListProps) => { @@ -83,5 +83,3 @@ const ShortUrlsList = ( ); }, () => [Topics.visits]); - -export default ShortUrlsList; diff --git a/src/short-urls/helpers/CreateShortUrlResult.tsx b/src/short-urls/helpers/CreateShortUrlResult.tsx index f3e2cbfd..3345a4ee 100644 --- a/src/short-urls/helpers/CreateShortUrlResult.tsx +++ b/src/short-urls/helpers/CreateShortUrlResult.tsx @@ -16,7 +16,7 @@ export interface CreateShortUrlResultProps extends ShortUrlCreation { canBeClosed?: boolean; } -const CreateShortUrlResult = (useStateFlagTimeout: StateFlagTimeout) => ( +export const CreateShortUrlResult = (useStateFlagTimeout: StateFlagTimeout) => ( { error, errorData, result, resetCreateShortUrl, canBeClosed = false }: CreateShortUrlResultProps, ) => { const [showCopyTooltip, setShowCopyTooltip] = useStateFlagTimeout(); @@ -61,5 +61,3 @@ const CreateShortUrlResult = (useStateFlagTimeout: StateFlagTimeout) => ( ); }; - -export default CreateShortUrlResult; diff --git a/src/short-urls/helpers/DeleteShortUrlModal.tsx b/src/short-urls/helpers/DeleteShortUrlModal.tsx index 106690ce..1bf7579f 100644 --- a/src/short-urls/helpers/DeleteShortUrlModal.tsx +++ b/src/short-urls/helpers/DeleteShortUrlModal.tsx @@ -14,7 +14,7 @@ interface DeleteShortUrlModalConnectProps extends ShortUrlModalProps { resetDeleteShortUrl: () => void; } -const DeleteShortUrlModal = ( +export const DeleteShortUrlModal = ( { shortUrl, toggle, isOpen, shortUrlDeletion, resetDeleteShortUrl, deleteShortUrl }: DeleteShortUrlModalConnectProps, ) => { const [inputValue, setInputValue] = useState(''); @@ -70,5 +70,3 @@ const DeleteShortUrlModal = ( ); }; - -export default DeleteShortUrlModal; diff --git a/src/short-urls/helpers/QrCodeModal.tsx b/src/short-urls/helpers/QrCodeModal.tsx index 8e07279c..ac971806 100644 --- a/src/short-urls/helpers/QrCodeModal.tsx +++ b/src/short-urls/helpers/QrCodeModal.tsx @@ -17,7 +17,7 @@ interface QrCodeModalConnectProps extends ShortUrlModalProps { selectedServer: SelectedServer; } -const QrCodeModal = (imageDownloader: ImageDownloader) => ( +export const QrCodeModal = (imageDownloader: ImageDownloader) => ( { shortUrl: { shortUrl, shortCode }, toggle, isOpen, selectedServer }: QrCodeModalConnectProps, ) => { const [size, setSize] = useState(300); @@ -107,5 +107,3 @@ const QrCodeModal = (imageDownloader: ImageDownloader) => ( ); }; - -export default QrCodeModal; diff --git a/src/short-urls/helpers/ShortUrlDetailLink.tsx b/src/short-urls/helpers/ShortUrlDetailLink.tsx index 2ba82055..d656043f 100644 --- a/src/short-urls/helpers/ShortUrlDetailLink.tsx +++ b/src/short-urls/helpers/ShortUrlDetailLink.tsx @@ -13,11 +13,10 @@ export interface ShortUrlDetailLinkProps { const buildUrl = ({ id }: ServerWithId, { shortCode, domain }: ShortUrl, suffix: LinkSuffix) => { const query = domain ? `?domain=${domain}` : ''; - return `/server/${id}/short-code/${shortCode}/${suffix}${query}`; }; -const ShortUrlDetailLink: FC> = ( +export const ShortUrlDetailLink: FC> = ( { selectedServer, shortUrl, suffix, children, ...rest }, ) => { if (!selectedServer || !isServerWithId(selectedServer) || !shortUrl) { @@ -26,5 +25,3 @@ const ShortUrlDetailLink: FC{children}; }; - -export default ShortUrlDetailLink; diff --git a/src/short-urls/helpers/ShortUrlVisitsCount.tsx b/src/short-urls/helpers/ShortUrlVisitsCount.tsx index 7cb2f9a5..cbe00c75 100644 --- a/src/short-urls/helpers/ShortUrlVisitsCount.tsx +++ b/src/short-urls/helpers/ShortUrlVisitsCount.tsx @@ -6,7 +6,7 @@ import classNames from 'classnames'; import { prettify } from '../../utils/helpers/numbers'; import { ShortUrl } from '../data'; import { SelectedServer } from '../../servers/data'; -import ShortUrlDetailLink from './ShortUrlDetailLink'; +import { ShortUrlDetailLink } from './ShortUrlDetailLink'; import './ShortUrlVisitsCount.scss'; interface ShortUrlVisitsCountProps { @@ -16,7 +16,9 @@ interface ShortUrlVisitsCountProps { active?: boolean; } -const ShortUrlVisitsCount = ({ visitsCount, shortUrl, selectedServer, active = false }: ShortUrlVisitsCountProps) => { +export const ShortUrlVisitsCount = ( + { visitsCount, shortUrl, selectedServer, active = false }: ShortUrlVisitsCountProps, +) => { const maxVisits = shortUrl?.meta?.maxVisits; const visitsLink = ( @@ -57,5 +59,3 @@ const ShortUrlVisitsCount = ({ visitsCount, shortUrl, selectedServer, active = f ); }; - -export default ShortUrlVisitsCount; diff --git a/src/short-urls/helpers/ShortUrlsRow.tsx b/src/short-urls/helpers/ShortUrlsRow.tsx index fa829a4d..a15d4692 100644 --- a/src/short-urls/helpers/ShortUrlsRow.tsx +++ b/src/short-urls/helpers/ShortUrlsRow.tsx @@ -1,14 +1,14 @@ import { FC, useEffect, useRef } from 'react'; import { isEmpty } from 'ramda'; import { ExternalLink } from 'react-external-link'; -import ColorGenerator from '../../utils/services/ColorGenerator'; +import { ColorGenerator } from '../../utils/services/ColorGenerator'; import { StateFlagTimeout } from '../../utils/helpers/hooks'; -import Tag from '../../tags/helpers/Tag'; +import { Tag } from '../../tags/helpers/Tag'; import { SelectedServer } from '../../servers/data'; import { CopyToClipboardIcon } from '../../utils/CopyToClipboardIcon'; import { ShortUrl } from '../data'; import { Time } from '../../utils/Time'; -import ShortUrlVisitsCount from './ShortUrlVisitsCount'; +import { ShortUrlVisitsCount } from './ShortUrlVisitsCount'; import { ShortUrlsRowMenuProps } from './ShortUrlsRowMenu'; import './ShortUrlsRow.scss'; @@ -18,7 +18,7 @@ export interface ShortUrlsRowProps { shortUrl: ShortUrl; } -const ShortUrlsRow = ( +export const ShortUrlsRow = ( ShortUrlsRowMenu: FC, colorGenerator: ColorGenerator, useStateFlagTimeout: StateFlagTimeout, @@ -87,5 +87,3 @@ const ShortUrlsRow = ( ); }; - -export default ShortUrlsRow; diff --git a/src/short-urls/helpers/ShortUrlsRowMenu.tsx b/src/short-urls/helpers/ShortUrlsRowMenu.tsx index a8ac0ade..877233f3 100644 --- a/src/short-urls/helpers/ShortUrlsRowMenu.tsx +++ b/src/short-urls/helpers/ShortUrlsRowMenu.tsx @@ -11,7 +11,7 @@ import { useToggle } from '../../utils/helpers/hooks'; import { ShortUrl, ShortUrlModalProps } from '../data'; import { SelectedServer } from '../../servers/data'; import { DropdownBtnMenu } from '../../utils/DropdownBtnMenu'; -import ShortUrlDetailLink from './ShortUrlDetailLink'; +import { ShortUrlDetailLink } from './ShortUrlDetailLink'; export interface ShortUrlsRowMenuProps { selectedServer: SelectedServer; @@ -19,7 +19,7 @@ export interface ShortUrlsRowMenuProps { } type ShortUrlModal = FC; -const ShortUrlsRowMenu = ( +export const ShortUrlsRowMenu = ( DeleteShortUrlModal: ShortUrlModal, QrCodeModal: ShortUrlModal, ) => ({ shortUrl, selectedServer }: ShortUrlsRowMenuProps) => { @@ -51,5 +51,3 @@ const ShortUrlsRowMenu = ( ); }; - -export default ShortUrlsRowMenu; diff --git a/src/short-urls/services/provideServices.ts b/src/short-urls/services/provideServices.ts index 3124ba93..f6d1533f 100644 --- a/src/short-urls/services/provideServices.ts +++ b/src/short-urls/services/provideServices.ts @@ -1,18 +1,18 @@ import Bottle from 'bottlejs'; import { ShortUrlsFilteringBar } from '../ShortUrlsFilteringBar'; -import ShortUrlsList from '../ShortUrlsList'; -import ShortUrlsRow from '../helpers/ShortUrlsRow'; -import ShortUrlsRowMenu from '../helpers/ShortUrlsRowMenu'; -import CreateShortUrl from '../CreateShortUrl'; -import DeleteShortUrlModal from '../helpers/DeleteShortUrlModal'; -import CreateShortUrlResult from '../helpers/CreateShortUrlResult'; +import { ShortUrlsList } from '../ShortUrlsList'; +import { ShortUrlsRow } from '../helpers/ShortUrlsRow'; +import { ShortUrlsRowMenu } from '../helpers/ShortUrlsRowMenu'; +import { CreateShortUrl } from '../CreateShortUrl'; +import { DeleteShortUrlModal } from '../helpers/DeleteShortUrlModal'; +import { CreateShortUrlResult } from '../helpers/CreateShortUrlResult'; import { listShortUrls } from '../reducers/shortUrlsList'; import { createShortUrl, resetCreateShortUrl } from '../reducers/shortUrlCreation'; import { deleteShortUrl, resetDeleteShortUrl } from '../reducers/shortUrlDeletion'; import { editShortUrl } from '../reducers/shortUrlEdition'; import { ConnectDecorator } from '../../container/types'; import { ShortUrlsTable } from '../ShortUrlsTable'; -import QrCodeModal from '../helpers/QrCodeModal'; +import { QrCodeModal } from '../helpers/QrCodeModal'; import { ShortUrlForm } from '../ShortUrlForm'; import { EditShortUrl } from '../EditShortUrl'; import { getShortUrlDetail } from '../reducers/shortUrlDetail'; diff --git a/src/tags/TagCard.tsx b/src/tags/TagCard.tsx index 755d9769..29d90828 100644 --- a/src/tags/TagCard.tsx +++ b/src/tags/TagCard.tsx @@ -5,9 +5,9 @@ import { FC, useEffect, useRef } from 'react'; import { Link } from 'react-router-dom'; import { prettify } from '../utils/helpers/numbers'; import { useToggle } from '../utils/helpers/hooks'; -import ColorGenerator from '../utils/services/ColorGenerator'; +import { ColorGenerator } from '../utils/services/ColorGenerator'; import { getServerId, SelectedServer } from '../servers/data'; -import TagBullet from './helpers/TagBullet'; +import { TagBullet } from './helpers/TagBullet'; import { NormalizedTag, TagModalProps } from './data'; import './TagCard.scss'; @@ -20,7 +20,7 @@ export interface TagCardProps { const isTruncated = (el: HTMLElement | undefined): boolean => !!el && el.scrollWidth > el.clientWidth; -const TagCard = ( +export const TagCard = ( DeleteTagConfirmModal: FC, EditTagModal: FC, colorGenerator: ColorGenerator, @@ -82,5 +82,3 @@ const TagCard = ( ); }; - -export default TagCard; diff --git a/src/tags/TagsList.tsx b/src/tags/TagsList.tsx index fe64a26a..2c825931 100644 --- a/src/tags/TagsList.tsx +++ b/src/tags/TagsList.tsx @@ -1,7 +1,7 @@ import { FC, useEffect, useState } from 'react'; import { Row } from 'reactstrap'; import { pipe } from 'ramda'; -import Message from '../utils/Message'; +import { Message } from '../utils/Message'; import { SearchField } from '../utils/SearchField'; import { SelectedServer } from '../servers/data'; import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub'; diff --git a/src/tags/TagsTableRow.tsx b/src/tags/TagsTableRow.tsx index 55bf4ba9..1bad323e 100644 --- a/src/tags/TagsTableRow.tsx +++ b/src/tags/TagsTableRow.tsx @@ -4,11 +4,11 @@ import { DropdownItem } from 'reactstrap'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faTrash as deleteIcon, faPencilAlt as editIcon } from '@fortawesome/free-solid-svg-icons'; import { getServerId, SelectedServer } from '../servers/data'; -import ColorGenerator from '../utils/services/ColorGenerator'; +import { ColorGenerator } from '../utils/services/ColorGenerator'; import { prettify } from '../utils/helpers/numbers'; import { useToggle } from '../utils/helpers/hooks'; import { DropdownBtnMenu } from '../utils/DropdownBtnMenu'; -import TagBullet from './helpers/TagBullet'; +import { TagBullet } from './helpers/TagBullet'; import { NormalizedTag, TagModalProps } from './data'; export interface TagsTableRowProps { diff --git a/src/tags/helpers/DeleteTagConfirmModal.tsx b/src/tags/helpers/DeleteTagConfirmModal.tsx index 61027e88..fd9e4a5a 100644 --- a/src/tags/helpers/DeleteTagConfirmModal.tsx +++ b/src/tags/helpers/DeleteTagConfirmModal.tsx @@ -10,7 +10,7 @@ interface DeleteTagConfirmModalProps extends TagModalProps { tagDelete: TagDeletion; } -const DeleteTagConfirmModal = ( +export const DeleteTagConfirmModal = ( { tag, toggle, isOpen, deleteTag, tagDelete, tagDeleted }: DeleteTagConfirmModalProps, ) => { const { deleting, error, errorData } = tagDelete; @@ -42,5 +42,3 @@ const DeleteTagConfirmModal = ( ); }; - -export default DeleteTagConfirmModal; diff --git a/src/tags/helpers/EditTagModal.tsx b/src/tags/helpers/EditTagModal.tsx index 6bd676ae..b03a00a7 100644 --- a/src/tags/helpers/EditTagModal.tsx +++ b/src/tags/helpers/EditTagModal.tsx @@ -5,7 +5,7 @@ import { faPalette as colorIcon } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { useToggle } from '../../utils/helpers/hooks'; import { handleEventPreventingDefault } from '../../utils/utils'; -import ColorGenerator from '../../utils/services/ColorGenerator'; +import { ColorGenerator } from '../../utils/services/ColorGenerator'; import { TagModalProps } from '../data'; import { TagEdition } from '../reducers/tagEdit'; import { Result } from '../../utils/Result'; @@ -18,7 +18,7 @@ interface EditTagModalProps extends TagModalProps { tagEdited: (oldName: string, newName: string, color: string) => void; } -const EditTagModal = ({ getColorForKey }: ColorGenerator) => ( +export const EditTagModal = ({ getColorForKey }: ColorGenerator) => ( { tag, editTag, toggle, tagEdited, isOpen, tagEdit }: EditTagModalProps, ) => { const [newTagName, setNewTagName] = useState(tag); @@ -78,5 +78,3 @@ const EditTagModal = ({ getColorForKey }: ColorGenerator) => ( ); }; - -export default EditTagModal; diff --git a/src/tags/helpers/Tag.tsx b/src/tags/helpers/Tag.tsx index 1bfa2daf..b61bc1b5 100644 --- a/src/tags/helpers/Tag.tsx +++ b/src/tags/helpers/Tag.tsx @@ -1,6 +1,6 @@ import { FC, MouseEventHandler, PropsWithChildren } from 'react'; import classNames from 'classnames'; -import ColorGenerator from '../../utils/services/ColorGenerator'; +import { ColorGenerator } from '../../utils/services/ColorGenerator'; import './Tag.scss'; type TagProps = PropsWithChildren<{ @@ -12,7 +12,7 @@ type TagProps = PropsWithChildren<{ onClose?: MouseEventHandler; }>; -const Tag: FC = ({ text, children, clearable, className = '', colorGenerator, onClick, onClose }) => ( +export const Tag: FC = ({ text, children, clearable, className = '', colorGenerator, onClick, onClose }) => ( = ({ text, children, clearable, className = '', colorGen {clearable && ×} ); - -export default Tag; diff --git a/src/tags/helpers/TagBullet.tsx b/src/tags/helpers/TagBullet.tsx index d7769262..dc84f729 100644 --- a/src/tags/helpers/TagBullet.tsx +++ b/src/tags/helpers/TagBullet.tsx @@ -1,4 +1,4 @@ -import ColorGenerator from '../../utils/services/ColorGenerator'; +import { ColorGenerator } from '../../utils/services/ColorGenerator'; import './TagBullet.scss'; interface TagBulletProps { @@ -6,11 +6,9 @@ interface TagBulletProps { colorGenerator: ColorGenerator; } -const TagBullet = ({ tag, colorGenerator }: TagBulletProps) => ( +export const TagBullet = ({ tag, colorGenerator }: TagBulletProps) => (
); - -export default TagBullet; diff --git a/src/tags/helpers/TagsSelector.tsx b/src/tags/helpers/TagsSelector.tsx index 6f47b58f..3d785af3 100644 --- a/src/tags/helpers/TagsSelector.tsx +++ b/src/tags/helpers/TagsSelector.tsx @@ -1,10 +1,10 @@ import { useEffect } from 'react'; import ReactTags, { SuggestionComponentProps, TagComponentProps } from 'react-tag-autocomplete'; -import ColorGenerator from '../../utils/services/ColorGenerator'; +import { ColorGenerator } from '../../utils/services/ColorGenerator'; import { Settings } from '../../settings/reducers/settings'; import { TagsList } from '../reducers/tagsList'; -import TagBullet from './TagBullet'; -import Tag from './Tag'; +import { TagBullet } from './TagBullet'; +import { Tag } from './Tag'; export interface TagsSelectorProps { selectedTags: string[]; @@ -21,7 +21,7 @@ interface TagsSelectorConnectProps extends TagsSelectorProps { const toComponentTag = (tag: string) => ({ id: tag, name: tag }); -const TagsSelector = (colorGenerator: ColorGenerator) => ( +export const TagsSelector = (colorGenerator: ColorGenerator) => ( { selectedTags, onChange, placeholder, listTags, tagsList, settings, allowNew = true }: TagsSelectorConnectProps, ) => { useEffect(() => { @@ -68,5 +68,3 @@ const TagsSelector = (colorGenerator: ColorGenerator) => ( /> ); }; - -export default TagsSelector; diff --git a/src/tags/reducers/tagEdit.ts b/src/tags/reducers/tagEdit.ts index 6e9829a8..ea58ad8c 100644 --- a/src/tags/reducers/tagEdit.ts +++ b/src/tags/reducers/tagEdit.ts @@ -2,7 +2,7 @@ import { pick } from 'ramda'; import { Action, Dispatch } from 'redux'; import { buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; -import ColorGenerator from '../../utils/services/ColorGenerator'; +import { ColorGenerator } from '../../utils/services/ColorGenerator'; import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; diff --git a/src/tags/services/provideServices.ts b/src/tags/services/provideServices.ts index aca9130c..e7d58453 100644 --- a/src/tags/services/provideServices.ts +++ b/src/tags/services/provideServices.ts @@ -1,8 +1,8 @@ import Bottle, { IContainer } from 'bottlejs'; -import TagsSelector from '../helpers/TagsSelector'; -import TagCard from '../TagCard'; -import DeleteTagConfirmModal from '../helpers/DeleteTagConfirmModal'; -import EditTagModal from '../helpers/EditTagModal'; +import { TagsSelector } from '../helpers/TagsSelector'; +import { TagCard } from '../TagCard'; +import { DeleteTagConfirmModal } from '../helpers/DeleteTagConfirmModal'; +import { EditTagModal } from '../helpers/EditTagModal'; import { TagsList } from '../TagsList'; import { filterTags, listTags } from '../reducers/tagsList'; import { deleteTag, tagDeleted } from '../reducers/tagDelete'; diff --git a/src/utils/BooleanControl.tsx b/src/utils/BooleanControl.tsx index 76360a7c..fd93a8d0 100644 --- a/src/utils/BooleanControl.tsx +++ b/src/utils/BooleanControl.tsx @@ -14,7 +14,7 @@ interface BooleanControlWithTypeProps extends BooleanControlProps { type: 'switch' | 'checkbox'; } -const BooleanControl: FC = ( +export const BooleanControl: FC = ( { checked = false, onChange = identity, className, children, type, inline = false }, ) => { const id = useDomId(); @@ -32,5 +32,3 @@ const BooleanControl: FC = ( ); }; - -export default BooleanControl; diff --git a/src/utils/Checkbox.tsx b/src/utils/Checkbox.tsx index 6a589dbf..4e4ef083 100644 --- a/src/utils/Checkbox.tsx +++ b/src/utils/Checkbox.tsx @@ -1,4 +1,4 @@ import { FC } from 'react'; -import BooleanControl, { BooleanControlProps } from './BooleanControl'; +import { BooleanControl, BooleanControlProps } from './BooleanControl'; export const Checkbox: FC = (props) => ; diff --git a/src/utils/DateInput.tsx b/src/utils/DateInput.tsx index f365d477..f2b7cc96 100644 --- a/src/utils/DateInput.tsx +++ b/src/utils/DateInput.tsx @@ -8,7 +8,7 @@ import './DateInput.scss'; export type DateInputProps = ReactDatePickerProps; -const DateInput = (props: DateInputProps) => { +export const DateInput = (props: DateInputProps) => { const { className, isClearable, selected } = props; const showCalendarIcon = !isClearable || isNil(selected); const ref = useRef<{ input: HTMLInputElement }>(); @@ -32,5 +32,3 @@ const DateInput = (props: DateInputProps) => {
); }; - -export default DateInput; diff --git a/src/utils/Message.tsx b/src/utils/Message.tsx index 7d267ca4..e171e93c 100644 --- a/src/utils/Message.tsx +++ b/src/utils/Message.tsx @@ -30,7 +30,9 @@ export type MessageProps = PropsWithChildren<{ type?: MessageType; }>; -const Message: FC = ({ className, children, loading = false, type = 'default', fullWidth = false }) => { +export const Message: FC = ( + { className, children, loading = false, type = 'default', fullWidth = false }, +) => { const classes = classNames({ 'col-md-12': fullWidth, 'col-md-10 offset-md-1': !fullWidth, @@ -50,5 +52,3 @@ const Message: FC = ({ className, children, loading = false, type ); }; - -export default Message; diff --git a/src/utils/PaginationDropdown.tsx b/src/utils/PaginationDropdown.tsx index f98af1a9..c349dc52 100644 --- a/src/utils/PaginationDropdown.tsx +++ b/src/utils/PaginationDropdown.tsx @@ -7,7 +7,7 @@ interface PaginationDropdownProps { toggleClassName?: string; } -const PaginationDropdown = ({ toggleClassName, ranges, value, setValue }: PaginationDropdownProps) => ( +export const PaginationDropdown = ({ toggleClassName, ranges, value, setValue }: PaginationDropdownProps) => ( Paginate @@ -23,5 +23,3 @@ const PaginationDropdown = ({ toggleClassName, ranges, value, setValue }: Pagina ); - -export default PaginationDropdown; diff --git a/src/utils/ToggleSwitch.tsx b/src/utils/ToggleSwitch.tsx index 7b86b370..797e9b5d 100644 --- a/src/utils/ToggleSwitch.tsx +++ b/src/utils/ToggleSwitch.tsx @@ -1,4 +1,4 @@ import { FC } from 'react'; -import BooleanControl, { BooleanControlProps } from './BooleanControl'; +import { BooleanControl, BooleanControlProps } from './BooleanControl'; export const ToggleSwitch: FC = (props) => ; diff --git a/src/utils/dates/DateRangeRow.tsx b/src/utils/dates/DateRangeRow.tsx index a3a2e917..3712fb86 100644 --- a/src/utils/dates/DateRangeRow.tsx +++ b/src/utils/dates/DateRangeRow.tsx @@ -1,5 +1,5 @@ import { endOfDay } from 'date-fns'; -import DateInput from '../DateInput'; +import { DateInput } from '../DateInput'; import { DateRange } from './types'; interface DateRangeRowProps extends DateRange { @@ -8,7 +8,7 @@ interface DateRangeRowProps extends DateRange { disabled?: boolean; } -const DateRangeRow = ( +export const DateRangeRow = ( { startDate = null, endDate = null, disabled = false, onStartDateChange, onEndDateChange }: DateRangeRowProps, ) => (
@@ -35,5 +35,3 @@ const DateRangeRow = (
); - -export default DateRangeRow; diff --git a/src/utils/dates/DateRangeSelector.tsx b/src/utils/dates/DateRangeSelector.tsx index 08a569b4..1b2a89cd 100644 --- a/src/utils/dates/DateRangeSelector.tsx +++ b/src/utils/dates/DateRangeSelector.tsx @@ -10,7 +10,7 @@ import { rangeIsInterval, dateRangeIsEmpty, } from './types'; -import DateRangeRow from './DateRangeRow'; +import { DateRangeRow } from './DateRangeRow'; import { DateIntervalDropdownItems } from './DateIntervalDropdownItems'; export interface DateRangeSelectorProps { diff --git a/src/utils/services/ColorGenerator.ts b/src/utils/services/ColorGenerator.ts index 75fbb04c..b440ab52 100644 --- a/src/utils/services/ColorGenerator.ts +++ b/src/utils/services/ColorGenerator.ts @@ -1,6 +1,6 @@ import { isNil } from 'ramda'; import { rangeOf } from '../utils'; -import LocalStorage from './LocalStorage'; +import { LocalStorage } from './LocalStorage'; const HEX_COLOR_LENGTH = 6; const HEX_DIGITS = '0123456789ABCDEF'; @@ -15,7 +15,7 @@ const hexColorToRgbArray = (colorHex: string): number[] => // HSP by Darel Rex Finley https://alienryderflex.com/hsp.html const perceivedLightness = (r = 0, g = 0, b = 0) => round(sqrt(0.299 * r ** 2 + 0.587 * g ** 2 + 0.114 * b ** 2)); -export default class ColorGenerator { +export class ColorGenerator { private readonly colors: Record; private readonly lights: Record; diff --git a/src/utils/services/LocalStorage.ts b/src/utils/services/LocalStorage.ts index 914a5a2c..9c404e07 100644 --- a/src/utils/services/LocalStorage.ts +++ b/src/utils/services/LocalStorage.ts @@ -1,7 +1,7 @@ const PREFIX = 'shlink'; const buildPath = (path: string) => `${PREFIX}.${path}`; -export default class LocalStorage { +export class LocalStorage { public constructor(private readonly localStorage: Storage) {} public readonly get = (key: string): T | undefined => { diff --git a/src/utils/services/provideServices.ts b/src/utils/services/provideServices.ts index f9fdce0e..578a945c 100644 --- a/src/utils/services/provideServices.ts +++ b/src/utils/services/provideServices.ts @@ -1,7 +1,7 @@ import Bottle from 'bottlejs'; import { useStateFlagTimeout } from '../helpers/hooks'; -import LocalStorage from './LocalStorage'; -import ColorGenerator from './ColorGenerator'; +import { LocalStorage } from './LocalStorage'; +import { ColorGenerator } from './ColorGenerator'; import { csvToJson, jsonToCsv } from '../helpers/csvjson'; const provideServices = (bottle: Bottle) => { diff --git a/src/visits/DomainVisits.tsx b/src/visits/DomainVisits.tsx index 2283ad39..b759f167 100644 --- a/src/visits/DomainVisits.tsx +++ b/src/visits/DomainVisits.tsx @@ -9,7 +9,7 @@ import { useGoBack } from '../utils/helpers/hooks'; import { toApiParams } from './types/helpers'; import { NormalizedVisit } from './types'; import { VisitsStats } from './VisitsStats'; -import VisitsHeader from './VisitsHeader'; +import { VisitsHeader } from './VisitsHeader'; export interface DomainVisitsProps extends CommonVisitsProps { getDomainVisits: (domain: string, query?: ShlinkVisitsParams, doIntervalFallback?: boolean) => void; diff --git a/src/visits/NonOrphanVisits.tsx b/src/visits/NonOrphanVisits.tsx index 2c2cbe4f..6113cfd6 100644 --- a/src/visits/NonOrphanVisits.tsx +++ b/src/visits/NonOrphanVisits.tsx @@ -7,7 +7,7 @@ import { VisitsStats } from './VisitsStats'; import { NormalizedVisit, VisitsInfo, VisitsParams } from './types'; import { CommonVisitsProps } from './types/CommonVisitsProps'; import { toApiParams } from './types/helpers'; -import VisitsHeader from './VisitsHeader'; +import { VisitsHeader } from './VisitsHeader'; export interface NonOrphanVisitsProps extends CommonVisitsProps { getNonOrphanVisits: (params?: ShlinkVisitsParams, doIntervalFallback?: boolean) => void; diff --git a/src/visits/OrphanVisits.tsx b/src/visits/OrphanVisits.tsx index 45723ec2..dbd3d8ba 100644 --- a/src/visits/OrphanVisits.tsx +++ b/src/visits/OrphanVisits.tsx @@ -7,7 +7,7 @@ import { VisitsStats } from './VisitsStats'; import { NormalizedVisit, OrphanVisitType, VisitsInfo, VisitsParams } from './types'; import { CommonVisitsProps } from './types/CommonVisitsProps'; import { toApiParams } from './types/helpers'; -import VisitsHeader from './VisitsHeader'; +import { VisitsHeader } from './VisitsHeader'; export interface OrphanVisitsProps extends CommonVisitsProps { getOrphanVisits: ( diff --git a/src/visits/ShortUrlVisits.tsx b/src/visits/ShortUrlVisits.tsx index 748e8221..4fc4ec23 100644 --- a/src/visits/ShortUrlVisits.tsx +++ b/src/visits/ShortUrlVisits.tsx @@ -8,7 +8,7 @@ import { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail'; import { useGoBack } from '../utils/helpers/hooks'; import { ReportExporter } from '../common/services/ReportExporter'; import { ShortUrlVisits as ShortUrlVisitsState } from './reducers/shortUrlVisits'; -import ShortUrlVisitsHeader from './ShortUrlVisitsHeader'; +import { ShortUrlVisitsHeader } from './ShortUrlVisitsHeader'; import { VisitsStats } from './VisitsStats'; import { NormalizedVisit, VisitsParams } from './types'; import { CommonVisitsProps } from './types/CommonVisitsProps'; @@ -22,7 +22,7 @@ export interface ShortUrlVisitsProps extends CommonVisitsProps { cancelGetShortUrlVisits: () => void; } -const ShortUrlVisits = ({ exportVisits }: ReportExporter) => boundToMercureHub(({ +export const ShortUrlVisits = ({ exportVisits }: ReportExporter) => boundToMercureHub(({ shortUrlVisits, shortUrlDetail, getShortUrlVisits, @@ -60,5 +60,3 @@ const ShortUrlVisits = ({ exportVisits }: ReportExporter) => boundToMercureHub(( ); }, (_, params) => [Topics.shortUrlVisits(params.shortCode)]); - -export default ShortUrlVisits; diff --git a/src/visits/ShortUrlVisitsHeader.tsx b/src/visits/ShortUrlVisitsHeader.tsx index f7d0bf5a..82f2d19b 100644 --- a/src/visits/ShortUrlVisitsHeader.tsx +++ b/src/visits/ShortUrlVisitsHeader.tsx @@ -3,7 +3,7 @@ import { ExternalLink } from 'react-external-link'; import { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail'; import { Time } from '../utils/Time'; import { ShortUrlVisits } from './reducers/shortUrlVisits'; -import VisitsHeader from './VisitsHeader'; +import { VisitsHeader } from './VisitsHeader'; import './ShortUrlVisitsHeader.scss'; interface ShortUrlVisitsHeaderProps { @@ -12,7 +12,7 @@ interface ShortUrlVisitsHeaderProps { goBack: () => void; } -const ShortUrlVisitsHeader = ({ shortUrlDetail, shortUrlVisits, goBack }: ShortUrlVisitsHeaderProps) => { +export const ShortUrlVisitsHeader = ({ shortUrlDetail, shortUrlVisits, goBack }: ShortUrlVisitsHeaderProps) => { const { shortUrl, loading } = shortUrlDetail; const { visits } = shortUrlVisits; const shortLink = shortUrl?.shortUrl ?? ''; @@ -43,5 +43,3 @@ const ShortUrlVisitsHeader = ({ shortUrlDetail, shortUrlVisits, goBack }: ShortU ); }; - -export default ShortUrlVisitsHeader; diff --git a/src/visits/TagVisits.tsx b/src/visits/TagVisits.tsx index afacca7f..a7ce5ba1 100644 --- a/src/visits/TagVisits.tsx +++ b/src/visits/TagVisits.tsx @@ -1,12 +1,12 @@ import { useParams } from 'react-router-dom'; import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub'; -import ColorGenerator from '../utils/services/ColorGenerator'; +import { ColorGenerator } from '../utils/services/ColorGenerator'; import { ShlinkVisitsParams } from '../api/types'; import { Topics } from '../mercure/helpers/Topics'; import { useGoBack } from '../utils/helpers/hooks'; import { ReportExporter } from '../common/services/ReportExporter'; import { TagVisits as TagVisitsState } from './reducers/tagVisits'; -import TagVisitsHeader from './TagVisitsHeader'; +import { TagVisitsHeader } from './TagVisitsHeader'; import { VisitsStats } from './VisitsStats'; import { NormalizedVisit } from './types'; import { CommonVisitsProps } from './types/CommonVisitsProps'; @@ -18,7 +18,7 @@ export interface TagVisitsProps extends CommonVisitsProps { cancelGetTagVisits: () => void; } -const TagVisits = (colorGenerator: ColorGenerator, { exportVisits }: ReportExporter) => boundToMercureHub(({ +export const TagVisits = (colorGenerator: ColorGenerator, { exportVisits }: ReportExporter) => boundToMercureHub(({ getTagVisits, tagVisits, cancelGetTagVisits, @@ -44,5 +44,3 @@ const TagVisits = (colorGenerator: ColorGenerator, { exportVisits }: ReportExpor ); }, () => [Topics.visits]); - -export default TagVisits; diff --git a/src/visits/TagVisitsHeader.tsx b/src/visits/TagVisitsHeader.tsx index 88536a72..0de9df7c 100644 --- a/src/visits/TagVisitsHeader.tsx +++ b/src/visits/TagVisitsHeader.tsx @@ -1,6 +1,6 @@ -import Tag from '../tags/helpers/Tag'; -import ColorGenerator from '../utils/services/ColorGenerator'; -import VisitsHeader from './VisitsHeader'; +import { Tag } from '../tags/helpers/Tag'; +import { ColorGenerator } from '../utils/services/ColorGenerator'; +import { VisitsHeader } from './VisitsHeader'; import { TagVisits } from './reducers/tagVisits'; import './ShortUrlVisitsHeader.scss'; @@ -10,9 +10,8 @@ interface TagVisitsHeaderProps { colorGenerator: ColorGenerator; } -const TagVisitsHeader = ({ tagVisits, goBack, colorGenerator }: TagVisitsHeaderProps) => { +export const TagVisitsHeader = ({ tagVisits, goBack, colorGenerator }: TagVisitsHeaderProps) => { const { visits, tag } = tagVisits; - const visitsStatsTitle = ( Visits for @@ -22,5 +21,3 @@ const TagVisitsHeader = ({ tagVisits, goBack, colorGenerator }: TagVisitsHeaderP return ; }; - -export default TagVisitsHeader; diff --git a/src/visits/VisitsHeader.tsx b/src/visits/VisitsHeader.tsx index 85398a6b..7dca6459 100644 --- a/src/visits/VisitsHeader.tsx +++ b/src/visits/VisitsHeader.tsx @@ -2,7 +2,7 @@ import { Button, Card } from 'reactstrap'; import { FC, PropsWithChildren, ReactNode } from 'react'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faArrowLeft } from '@fortawesome/free-solid-svg-icons'; -import ShortUrlVisitsCount from '../short-urls/helpers/ShortUrlVisitsCount'; +import { ShortUrlVisitsCount } from '../short-urls/helpers/ShortUrlVisitsCount'; import { ShortUrl } from '../short-urls/data'; import { Visit } from './types'; @@ -13,7 +13,7 @@ type VisitsHeaderProps = PropsWithChildren<{ shortUrl?: ShortUrl; }>; -const VisitsHeader: FC = ({ visits, goBack, shortUrl, children, title }) => ( +export const VisitsHeader: FC = ({ visits, goBack, shortUrl, children, title }) => (

@@ -36,5 +36,3 @@ const VisitsHeader: FC = ({ visits, goBack, shortUrl, childre

); - -export default VisitsHeader; diff --git a/src/visits/VisitsStats.tsx b/src/visits/VisitsStats.tsx index cb716261..41e37d0a 100644 --- a/src/visits/VisitsStats.tsx +++ b/src/visits/VisitsStats.tsx @@ -7,7 +7,7 @@ import { IconDefinition } from '@fortawesome/fontawesome-common-types'; import { Route, Routes, Navigate } from 'react-router-dom'; import classNames from 'classnames'; import { DateRangeSelector } from '../utils/dates/DateRangeSelector'; -import Message from '../utils/Message'; +import { Message } from '../utils/Message'; import { DateInterval, DateRange, intervalToDateRange } from '../utils/dates/types'; import { Result } from '../utils/Result'; import { ShlinkApiError } from '../api/ShlinkApiError'; @@ -18,9 +18,9 @@ import { prettify } from '../utils/helpers/numbers'; import { NavPillItem, NavPills } from '../utils/NavPills'; import { ExportBtn } from '../utils/ExportBtn'; import { LineChartCard } from './charts/LineChartCard'; -import VisitsTable from './VisitsTable'; +import { VisitsTable } from './VisitsTable'; import { NormalizedOrphanVisit, NormalizedVisit, VisitsFilter, VisitsInfo, VisitsParams } from './types'; -import OpenMapModalBtn from './helpers/OpenMapModalBtn'; +import { OpenMapModalBtn } from './helpers/OpenMapModalBtn'; import { normalizeVisits, processStatsFromVisits } from './services/VisitsParser'; import { VisitsFilterDropdown } from './helpers/VisitsFilterDropdown'; import { HighlightableProps, highlightedVisitsToStats } from './types/helpers'; diff --git a/src/visits/VisitsTable.tsx b/src/visits/VisitsTable.tsx index 28ca9c61..39e30c48 100644 --- a/src/visits/VisitsTable.tsx +++ b/src/visits/VisitsTable.tsx @@ -45,7 +45,7 @@ const calculateVisits = (allVisits: NormalizedVisit[], searchTerm: string | unde return { visitsGroups, total }; }; -const VisitsTable = ({ +export const VisitsTable = ({ visits, selectedVisits = [], setSelectedVisits, @@ -222,5 +222,3 @@ const VisitsTable = ({ ); }; - -export default VisitsTable; diff --git a/src/visits/charts/SortableBarChartCard.tsx b/src/visits/charts/SortableBarChartCard.tsx index 23790ec3..83219b73 100644 --- a/src/visits/charts/SortableBarChartCard.tsx +++ b/src/visits/charts/SortableBarChartCard.tsx @@ -5,7 +5,7 @@ import { Order } from '../../utils/helpers/ordering'; import { SimplePaginator } from '../../common/SimplePaginator'; import { roundTen } from '../../utils/helpers/numbers'; import { OrderingDropdown } from '../../utils/OrderingDropdown'; -import PaginationDropdown from '../../utils/PaginationDropdown'; +import { PaginationDropdown } from '../../utils/PaginationDropdown'; import { Stats, StatsRow } from '../types'; import { HorizontalBarChart, HorizontalBarChartProps } from './HorizontalBarChart'; import { ChartCard } from './ChartCard'; diff --git a/src/visits/helpers/MapModal.tsx b/src/visits/helpers/MapModal.tsx index b672b1af..94dfa823 100644 --- a/src/visits/helpers/MapModal.tsx +++ b/src/visits/helpers/MapModal.tsx @@ -29,13 +29,13 @@ const calculateMapProps = (locations: CityStats[]): MapContainerProps => { } // When there's only one location, an error is thrown if trying to calculate the bounds. - // When that happens, we use zoom and center as a workaround + // When that happens, we use "zoom" and "center" as a workaround const [{ latLong: center }] = locations; return { zoom: 10, center }; }; -const MapModal = ({ toggle, isOpen, title, locations = [] }: MapModalProps) => ( +export const MapModal = ({ toggle, isOpen, title, locations = [] }: MapModalProps) => (

@@ -53,5 +53,3 @@ const MapModal = ({ toggle, isOpen, title, locations = [] }: MapModalProps) => ( ); - -export default MapModal; diff --git a/src/visits/helpers/OpenMapModalBtn.tsx b/src/visits/helpers/OpenMapModalBtn.tsx index 1afc8583..c6b367e1 100644 --- a/src/visits/helpers/OpenMapModalBtn.tsx +++ b/src/visits/helpers/OpenMapModalBtn.tsx @@ -4,7 +4,7 @@ import { faMapMarkedAlt as mapIcon } from '@fortawesome/free-solid-svg-icons'; import { Button, Dropdown, DropdownItem, DropdownMenu, UncontrolledTooltip } from 'reactstrap'; import { useDomId, useToggle } from '../../utils/helpers/hooks'; import { CityStats } from '../types'; -import MapModal from './MapModal'; +import { MapModal } from './MapModal'; import './OpenMapModalBtn.scss'; interface OpenMapModalBtnProps { @@ -13,7 +13,7 @@ interface OpenMapModalBtnProps { locations?: CityStats[]; } -const OpenMapModalBtn = ({ modalTitle, activeCities, locations = [] }: OpenMapModalBtnProps) => { +export const OpenMapModalBtn = ({ modalTitle, activeCities, locations = [] }: OpenMapModalBtnProps) => { const [mapIsOpened, , openMap, closeMap] = useToggle(); const [dropdownIsOpened, toggleDropdown, openDropdown] = useToggle(); const [locationsToShow, setLocationsToShow] = useState([]); @@ -51,5 +51,3 @@ const OpenMapModalBtn = ({ modalTitle, activeCities, locations = [] }: OpenMapMo ); }; - -export default OpenMapModalBtn; diff --git a/src/visits/services/provideServices.ts b/src/visits/services/provideServices.ts index efc9d620..a6b0d931 100644 --- a/src/visits/services/provideServices.ts +++ b/src/visits/services/provideServices.ts @@ -1,8 +1,8 @@ import Bottle from 'bottlejs'; -import MapModal from '../helpers/MapModal'; +import { MapModal } from '../helpers/MapModal'; import { createNewVisits } from '../reducers/visitCreation'; -import ShortUrlVisits from '../ShortUrlVisits'; -import TagVisits from '../TagVisits'; +import { ShortUrlVisits } from '../ShortUrlVisits'; +import { TagVisits } from '../TagVisits'; import { OrphanVisits } from '../OrphanVisits'; import { NonOrphanVisits } from '../NonOrphanVisits'; import { cancelGetShortUrlVisits, getShortUrlVisits } from '../reducers/shortUrlVisits'; diff --git a/test/servers/services/ServersExporter.test.ts b/test/servers/services/ServersExporter.test.ts index ffe7596a..54e93fcf 100644 --- a/test/servers/services/ServersExporter.test.ts +++ b/test/servers/services/ServersExporter.test.ts @@ -1,6 +1,6 @@ import { Mock } from 'ts-mockery'; import ServersExporter from '../../../src/servers/services/ServersExporter'; -import LocalStorage from '../../../src/utils/services/LocalStorage'; +import { LocalStorage } from '../../../src/utils/services/LocalStorage'; import { appendChild, removeChild, windowMock } from '../../mocks/WindowMock'; describe('ServersExporter', () => { diff --git a/test/settings/Settings.test.tsx b/test/settings/Settings.test.tsx index e3fd951d..3a94fb07 100644 --- a/test/settings/Settings.test.tsx +++ b/test/settings/Settings.test.tsx @@ -1,6 +1,6 @@ import { shallow } from 'enzyme'; import { Route } from 'react-router-dom'; -import createSettings from '../../src/settings/Settings'; +import { Settings as createSettings } from '../../src/settings/Settings'; import { NoMenuLayout } from '../../src/common/NoMenuLayout'; import { NavPillItem } from '../../src/utils/NavPills'; diff --git a/test/short-urls/CreateShortUrl.test.tsx b/test/short-urls/CreateShortUrl.test.tsx index 59cb732e..43dfdf90 100644 --- a/test/short-urls/CreateShortUrl.test.tsx +++ b/test/short-urls/CreateShortUrl.test.tsx @@ -1,6 +1,6 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Mock } from 'ts-mockery'; -import createShortUrlsCreator from '../../src/short-urls/CreateShortUrl'; +import { CreateShortUrl as createShortUrlsCreator } from '../../src/short-urls/CreateShortUrl'; import { ShortUrlCreation } from '../../src/short-urls/reducers/shortUrlCreation'; import { Settings } from '../../src/settings/reducers/settings'; diff --git a/test/short-urls/Paginator.test.tsx b/test/short-urls/Paginator.test.tsx index ed147a19..0e611429 100644 --- a/test/short-urls/Paginator.test.tsx +++ b/test/short-urls/Paginator.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { PaginationItem, PaginationLink } from 'reactstrap'; import { Mock } from 'ts-mockery'; -import Paginator from '../../src/short-urls/Paginator'; +import { Paginator } from '../../src/short-urls/Paginator'; import { ShlinkPaginator } from '../../src/api/types'; import { ELLIPSIS } from '../../src/utils/helpers/pagination'; diff --git a/test/short-urls/ShortUrlForm.test.tsx b/test/short-urls/ShortUrlForm.test.tsx index 13f424e4..15da680a 100644 --- a/test/short-urls/ShortUrlForm.test.tsx +++ b/test/short-urls/ShortUrlForm.test.tsx @@ -4,7 +4,7 @@ import { identity } from 'ramda'; import { Mock } from 'ts-mockery'; import { Input } from 'reactstrap'; import { ShortUrlForm as createShortUrlForm, Mode } from '../../src/short-urls/ShortUrlForm'; -import DateInput from '../../src/utils/DateInput'; +import { DateInput } from '../../src/utils/DateInput'; import { ShortUrlData } from '../../src/short-urls/data'; import { ReachableServer, SelectedServer } from '../../src/servers/data'; import { SimpleCard } from '../../src/utils/SimpleCard'; diff --git a/test/short-urls/ShortUrlsList.test.tsx b/test/short-urls/ShortUrlsList.test.tsx index 426c94ce..fa314655 100644 --- a/test/short-urls/ShortUrlsList.test.tsx +++ b/test/short-urls/ShortUrlsList.test.tsx @@ -2,11 +2,11 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { ReactElement } from 'react'; import { Mock } from 'ts-mockery'; import { useNavigate } from 'react-router-dom'; -import shortUrlsListCreator from '../../src/short-urls/ShortUrlsList'; +import { ShortUrlsList as createShortUrlsList } from '../../src/short-urls/ShortUrlsList'; import { ShortUrlsOrderableFields, ShortUrl, ShortUrlsOrder } from '../../src/short-urls/data'; import { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub'; import { ShortUrlsList as ShortUrlsListModel } from '../../src/short-urls/reducers/shortUrlsList'; -import Paginator from '../../src/short-urls/Paginator'; +import { Paginator } from '../../src/short-urls/Paginator'; import { ReachableServer } from '../../src/servers/data'; import { Settings } from '../../src/settings/reducers/settings'; @@ -36,7 +36,7 @@ describe('', () => { pagination: {}, }, }); - const ShortUrlsList = shortUrlsListCreator(ShortUrlsTable, ShortUrlsFilteringBar); + const ShortUrlsList = createShortUrlsList(ShortUrlsTable, ShortUrlsFilteringBar); const createWrapper = (defaultOrdering: ShortUrlsOrder = {}) => shallow( ({ mercureInfo: { loading: true } })} diff --git a/test/short-urls/helpers/CreateShortUrlResult.test.tsx b/test/short-urls/helpers/CreateShortUrlResult.test.tsx index 0f74d06f..7dd45c30 100644 --- a/test/short-urls/helpers/CreateShortUrlResult.test.tsx +++ b/test/short-urls/helpers/CreateShortUrlResult.test.tsx @@ -2,7 +2,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import CopyToClipboard from 'react-copy-to-clipboard'; import { Tooltip } from 'reactstrap'; import { Mock } from 'ts-mockery'; -import createCreateShortUrlResult from '../../../src/short-urls/helpers/CreateShortUrlResult'; +import { CreateShortUrlResult as createResult } from '../../../src/short-urls/helpers/CreateShortUrlResult'; import { ShortUrl } from '../../../src/short-urls/data'; import { StateFlagTimeout } from '../../../src/utils/helpers/hooks'; import { Result } from '../../../src/utils/Result'; @@ -11,7 +11,7 @@ describe('', () => { let wrapper: ShallowWrapper; const copyToClipboard = jest.fn(); const useStateFlagTimeout = jest.fn(() => [false, copyToClipboard]) as StateFlagTimeout; - const CreateShortUrlResult = createCreateShortUrlResult(useStateFlagTimeout); + const CreateShortUrlResult = createResult(useStateFlagTimeout); const createWrapper = (result: ShortUrl | null = null, error = false) => { wrapper = shallow( {}} result={result} error={error} saving={false} />, diff --git a/test/short-urls/helpers/DeleteShortUrlModal.test.tsx b/test/short-urls/helpers/DeleteShortUrlModal.test.tsx index af4a6014..fcbf9900 100644 --- a/test/short-urls/helpers/DeleteShortUrlModal.test.tsx +++ b/test/short-urls/helpers/DeleteShortUrlModal.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { identity } from 'ramda'; import { Mock } from 'ts-mockery'; -import DeleteShortUrlModal from '../../../src/short-urls/helpers/DeleteShortUrlModal'; +import { DeleteShortUrlModal } from '../../../src/short-urls/helpers/DeleteShortUrlModal'; import { ShortUrl } from '../../../src/short-urls/data'; import { ShortUrlDeletion } from '../../../src/short-urls/reducers/shortUrlDeletion'; import { ProblemDetailsError } from '../../../src/api/types'; diff --git a/test/short-urls/helpers/QrCodeModal.test.tsx b/test/short-urls/helpers/QrCodeModal.test.tsx index fad659dc..213aea9e 100644 --- a/test/short-urls/helpers/QrCodeModal.test.tsx +++ b/test/short-urls/helpers/QrCodeModal.test.tsx @@ -2,7 +2,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { ExternalLink } from 'react-external-link'; import { Button, FormGroup, Modal, ModalBody, ModalHeader, Row } from 'reactstrap'; import { Mock } from 'ts-mockery'; -import createQrCodeModal from '../../../src/short-urls/helpers/QrCodeModal'; +import { QrCodeModal as createQrCodeModal } from '../../../src/short-urls/helpers/QrCodeModal'; import { ShortUrl } from '../../../src/short-urls/data'; import { ReachableServer } from '../../../src/servers/data'; import { CopyToClipboardIcon } from '../../../src/utils/CopyToClipboardIcon'; diff --git a/test/short-urls/helpers/ShortUrlDetailLink.test.tsx b/test/short-urls/helpers/ShortUrlDetailLink.test.tsx index 5dfe257b..83671e5a 100644 --- a/test/short-urls/helpers/ShortUrlDetailLink.test.tsx +++ b/test/short-urls/helpers/ShortUrlDetailLink.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Link } from 'react-router-dom'; import { Mock } from 'ts-mockery'; -import ShortUrlDetailLink, { LinkSuffix } from '../../../src/short-urls/helpers/ShortUrlDetailLink'; +import { ShortUrlDetailLink, LinkSuffix } from '../../../src/short-urls/helpers/ShortUrlDetailLink'; import { NotFoundServer, ReachableServer } from '../../../src/servers/data'; import { ShortUrl } from '../../../src/short-urls/data'; diff --git a/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx b/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx index e6420e9b..474802f1 100644 --- a/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx +++ b/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { UncontrolledTooltip } from 'reactstrap'; import { Mock } from 'ts-mockery'; -import ShortUrlVisitsCount from '../../../src/short-urls/helpers/ShortUrlVisitsCount'; +import { ShortUrlVisitsCount } from '../../../src/short-urls/helpers/ShortUrlVisitsCount'; import { ShortUrl } from '../../../src/short-urls/data'; describe('', () => { diff --git a/test/short-urls/helpers/ShortUrlsRow.test.tsx b/test/short-urls/helpers/ShortUrlsRow.test.tsx index fcb9b562..fd917cf5 100644 --- a/test/short-urls/helpers/ShortUrlsRow.test.tsx +++ b/test/short-urls/helpers/ShortUrlsRow.test.tsx @@ -3,9 +3,9 @@ import { assoc, toString } from 'ramda'; import { Mock } from 'ts-mockery'; import { ExternalLink } from 'react-external-link'; import { formatISO } from 'date-fns'; -import createShortUrlsRow from '../../../src/short-urls/helpers/ShortUrlsRow'; -import Tag from '../../../src/tags/helpers/Tag'; -import ColorGenerator from '../../../src/utils/services/ColorGenerator'; +import { ShortUrlsRow as createShortUrlsRow } from '../../../src/short-urls/helpers/ShortUrlsRow'; +import { Tag } from '../../../src/tags/helpers/Tag'; +import { ColorGenerator } from '../../../src/utils/services/ColorGenerator'; import { StateFlagTimeout } from '../../../src/utils/helpers/hooks'; import { ShortUrl } from '../../../src/short-urls/data'; import { ReachableServer } from '../../../src/servers/data'; diff --git a/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx b/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx index 6476e312..0a967ad9 100644 --- a/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx +++ b/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { DropdownItem } from 'reactstrap'; import { Mock } from 'ts-mockery'; -import createShortUrlsRowMenu from '../../../src/short-urls/helpers/ShortUrlsRowMenu'; +import { ShortUrlsRowMenu as createShortUrlsRowMenu } from '../../../src/short-urls/helpers/ShortUrlsRowMenu'; import { ReachableServer } from '../../../src/servers/data'; import { ShortUrl } from '../../../src/short-urls/data'; import { DropdownBtnMenu } from '../../../src/utils/DropdownBtnMenu'; diff --git a/test/tags/TagCard.test.tsx b/test/tags/TagCard.test.tsx index 94189d12..914f143e 100644 --- a/test/tags/TagCard.test.tsx +++ b/test/tags/TagCard.test.tsx @@ -1,9 +1,9 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Link } from 'react-router-dom'; import { Mock } from 'ts-mockery'; -import createTagCard from '../../src/tags/TagCard'; -import TagBullet from '../../src/tags/helpers/TagBullet'; -import ColorGenerator from '../../src/utils/services/ColorGenerator'; +import { TagCard as createTagCard } from '../../src/tags/TagCard'; +import { TagBullet } from '../../src/tags/helpers/TagBullet'; +import { ColorGenerator } from '../../src/utils/services/ColorGenerator'; import { ReachableServer } from '../../src/servers/data'; describe('', () => { diff --git a/test/tags/TagsTableRow.test.tsx b/test/tags/TagsTableRow.test.tsx index bd8c5191..ffced252 100644 --- a/test/tags/TagsTableRow.test.tsx +++ b/test/tags/TagsTableRow.test.tsx @@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'; import { DropdownItem } from 'reactstrap'; import { TagsTableRow as createTagsTableRow } from '../../src/tags/TagsTableRow'; import { ReachableServer } from '../../src/servers/data'; -import ColorGenerator from '../../src/utils/services/ColorGenerator'; +import { ColorGenerator } from '../../src/utils/services/ColorGenerator'; import { DropdownBtnMenu } from '../../src/utils/DropdownBtnMenu'; describe('', () => { diff --git a/test/tags/helpers/DeleteTagConfirmModal.test.tsx b/test/tags/helpers/DeleteTagConfirmModal.test.tsx index f9bb7925..b8326fd9 100644 --- a/test/tags/helpers/DeleteTagConfirmModal.test.tsx +++ b/test/tags/helpers/DeleteTagConfirmModal.test.tsx @@ -1,6 +1,6 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Button, Modal, ModalBody, ModalFooter } from 'reactstrap'; -import DeleteTagConfirmModal from '../../../src/tags/helpers/DeleteTagConfirmModal'; +import { DeleteTagConfirmModal } from '../../../src/tags/helpers/DeleteTagConfirmModal'; import { TagDeletion } from '../../../src/tags/reducers/tagDelete'; describe('', () => { diff --git a/test/tags/helpers/EditTagModal.test.tsx b/test/tags/helpers/EditTagModal.test.tsx index 266f5d7a..6140caf6 100644 --- a/test/tags/helpers/EditTagModal.test.tsx +++ b/test/tags/helpers/EditTagModal.test.tsx @@ -3,8 +3,8 @@ import { Mock } from 'ts-mockery'; import { Button, Input, Modal, ModalHeader, Popover } from 'reactstrap'; import { HexColorPicker } from 'react-colorful'; import { TagEdition } from '../../../src/tags/reducers/tagEdit'; -import createEditTagModal from '../../../src/tags/helpers/EditTagModal'; -import ColorGenerator from '../../../src/utils/services/ColorGenerator'; +import { EditTagModal as createEditTagModal } from '../../../src/tags/helpers/EditTagModal'; +import { ColorGenerator } from '../../../src/utils/services/ColorGenerator'; import { Result } from '../../../src/utils/Result'; import { ProblemDetailsError } from '../../../src/api/types'; import { ShlinkApiError } from '../../../src/api/ShlinkApiError'; diff --git a/test/tags/helpers/Tag.test.tsx b/test/tags/helpers/Tag.test.tsx index 53a4bb4b..11ecfc4e 100644 --- a/test/tags/helpers/Tag.test.tsx +++ b/test/tags/helpers/Tag.test.tsx @@ -1,9 +1,9 @@ import { Mock } from 'ts-mockery'; import { shallow, ShallowWrapper } from 'enzyme'; import { ReactNode } from 'react'; -import ColorGenerator from '../../../src/utils/services/ColorGenerator'; +import { ColorGenerator } from '../../../src/utils/services/ColorGenerator'; import { MAIN_COLOR } from '../../../src/utils/theme'; -import Tag from '../../../src/tags/helpers/Tag'; +import { Tag } from '../../../src/tags/helpers/Tag'; describe('', () => { const onClick = jest.fn(); diff --git a/test/tags/helpers/TagsSelector.test.tsx b/test/tags/helpers/TagsSelector.test.tsx index b4d1f6fa..143e32da 100644 --- a/test/tags/helpers/TagsSelector.test.tsx +++ b/test/tags/helpers/TagsSelector.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Mock } from 'ts-mockery'; -import createTagsSelector from '../../../src/tags/helpers/TagsSelector'; -import ColorGenerator from '../../../src/utils/services/ColorGenerator'; +import { TagsSelector as createTagsSelector } from '../../../src/tags/helpers/TagsSelector'; +import { ColorGenerator } from '../../../src/utils/services/ColorGenerator'; import { TagsList } from '../../../src/tags/reducers/tagsList'; import { Settings } from '../../../src/settings/reducers/settings'; diff --git a/test/tags/reducers/tagEdit.test.ts b/test/tags/reducers/tagEdit.test.ts index 63c6b719..d000b343 100644 --- a/test/tags/reducers/tagEdit.test.ts +++ b/test/tags/reducers/tagEdit.test.ts @@ -9,7 +9,7 @@ import reducer, { EditTagAction, } from '../../../src/tags/reducers/tagEdit'; import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; -import ColorGenerator from '../../../src/utils/services/ColorGenerator'; +import { ColorGenerator } from '../../../src/utils/services/ColorGenerator'; import { ShlinkState } from '../../../src/container/types'; describe('tagEditReducer', () => { diff --git a/test/utils/DateInput.test.tsx b/test/utils/DateInput.test.tsx index 4ec93544..4a0ab9c0 100644 --- a/test/utils/DateInput.test.tsx +++ b/test/utils/DateInput.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Mock } from 'ts-mockery'; -import DateInput, { DateInputProps } from '../../src/utils/DateInput'; +import { DateInput, DateInputProps } from '../../src/utils/DateInput'; describe('', () => { let wrapped: ShallowWrapper; diff --git a/test/utils/Message.test.tsx b/test/utils/Message.test.tsx index 2ad9d531..4c658c20 100644 --- a/test/utils/Message.test.tsx +++ b/test/utils/Message.test.tsx @@ -2,7 +2,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { PropsWithChildren } from 'react'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Card } from 'reactstrap'; -import Message, { MessageProps } from '../../src/utils/Message'; +import { Message, MessageProps } from '../../src/utils/Message'; describe('', () => { let wrapper: ShallowWrapper; diff --git a/test/utils/PaginationDropdown.test.tsx b/test/utils/PaginationDropdown.test.tsx index 5a413a86..c3718398 100644 --- a/test/utils/PaginationDropdown.test.tsx +++ b/test/utils/PaginationDropdown.test.tsx @@ -1,6 +1,6 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { DropdownItem } from 'reactstrap'; -import PaginationDropdown from '../../src/utils/PaginationDropdown'; +import { PaginationDropdown } from '../../src/utils/PaginationDropdown'; describe('', () => { const setValue = jest.fn(); diff --git a/test/utils/dates/DateRangeRow.test.tsx b/test/utils/dates/DateRangeRow.test.tsx index 74cbf2a2..79c957c6 100644 --- a/test/utils/dates/DateRangeRow.test.tsx +++ b/test/utils/dates/DateRangeRow.test.tsx @@ -1,6 +1,6 @@ import { shallow, ShallowWrapper } from 'enzyme'; -import DateRangeRow from '../../../src/utils/dates/DateRangeRow'; -import DateInput from '../../../src/utils/DateInput'; +import { DateRangeRow } from '../../../src/utils/dates/DateRangeRow'; +import { DateInput } from '../../../src/utils/DateInput'; describe('', () => { let wrapper: ShallowWrapper; diff --git a/test/utils/dates/DateRangeSelector.test.tsx b/test/utils/dates/DateRangeSelector.test.tsx index 629f740d..4d2a8a49 100644 --- a/test/utils/dates/DateRangeSelector.test.tsx +++ b/test/utils/dates/DateRangeSelector.test.tsx @@ -4,7 +4,7 @@ import { Mock } from 'ts-mockery'; import { DateRangeSelector, DateRangeSelectorProps } from '../../../src/utils/dates/DateRangeSelector'; import { DateInterval } from '../../../src/utils/dates/types'; import { DateIntervalDropdownItems } from '../../../src/utils/dates/DateIntervalDropdownItems'; -import DateRangeRow from '../../../src/utils/dates/DateRangeRow'; +import { DateRangeRow } from '../../../src/utils/dates/DateRangeRow'; describe('', () => { let wrapper: ShallowWrapper; diff --git a/test/utils/services/ColorGenerator.test.ts b/test/utils/services/ColorGenerator.test.ts index c8f13894..86059d8f 100644 --- a/test/utils/services/ColorGenerator.test.ts +++ b/test/utils/services/ColorGenerator.test.ts @@ -1,6 +1,6 @@ import { Mock } from 'ts-mockery'; -import ColorGenerator from '../../../src/utils/services/ColorGenerator'; -import LocalStorage from '../../../src/utils/services/LocalStorage'; +import { ColorGenerator } from '../../../src/utils/services/ColorGenerator'; +import { LocalStorage } from '../../../src/utils/services/LocalStorage'; import { MAIN_COLOR } from '../../../src/utils/theme'; describe('ColorGenerator', () => { diff --git a/test/utils/services/Storage.test.ts b/test/utils/services/LocalStorage.test.ts similarity index 94% rename from test/utils/services/Storage.test.ts rename to test/utils/services/LocalStorage.test.ts index b8fd25b4..4f59cc1d 100644 --- a/test/utils/services/Storage.test.ts +++ b/test/utils/services/LocalStorage.test.ts @@ -1,5 +1,5 @@ import { Mock } from 'ts-mockery'; -import LocalStorage from '../../../src/utils/services/LocalStorage'; +import { LocalStorage } from '../../../src/utils/services/LocalStorage'; describe('LocalStorage', () => { const getItem = jest.fn((key) => (key === 'shlink.foo' ? JSON.stringify({ foo: 'bar' }) : null)); diff --git a/test/visits/OrphanVisits.test.tsx b/test/visits/OrphanVisits.test.tsx index 87129f32..b4641a3a 100644 --- a/test/visits/OrphanVisits.test.tsx +++ b/test/visits/OrphanVisits.test.tsx @@ -7,7 +7,7 @@ import { VisitsStats } from '../../src/visits/VisitsStats'; import { Settings } from '../../src/settings/reducers/settings'; import { ReportExporter } from '../../src/common/services/ReportExporter'; import { SelectedServer } from '../../src/servers/data'; -import VisitsHeader from '../../src/visits/VisitsHeader'; +import { VisitsHeader } from '../../src/visits/VisitsHeader'; jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), diff --git a/test/visits/ShortUrlVisits.test.tsx b/test/visits/ShortUrlVisits.test.tsx index 33713113..984648f2 100644 --- a/test/visits/ShortUrlVisits.test.tsx +++ b/test/visits/ShortUrlVisits.test.tsx @@ -1,8 +1,8 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { identity } from 'ramda'; import { Mock } from 'ts-mockery'; -import createShortUrlVisits, { ShortUrlVisitsProps } from '../../src/visits/ShortUrlVisits'; -import ShortUrlVisitsHeader from '../../src/visits/ShortUrlVisitsHeader'; +import { ShortUrlVisits as createShortUrlVisits, ShortUrlVisitsProps } from '../../src/visits/ShortUrlVisits'; +import { ShortUrlVisitsHeader } from '../../src/visits/ShortUrlVisitsHeader'; import { ShortUrlVisits as ShortUrlVisitsState } from '../../src/visits/reducers/shortUrlVisits'; import { ShortUrlDetail } from '../../src/short-urls/reducers/shortUrlDetail'; import { VisitsStats } from '../../src/visits/VisitsStats'; diff --git a/test/visits/ShortUrlVisitsHeader.test.tsx b/test/visits/ShortUrlVisitsHeader.test.tsx index b646dcce..ba814ebd 100644 --- a/test/visits/ShortUrlVisitsHeader.test.tsx +++ b/test/visits/ShortUrlVisitsHeader.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { ExternalLink } from 'react-external-link'; import { Mock } from 'ts-mockery'; -import ShortUrlVisitsHeader from '../../src/visits/ShortUrlVisitsHeader'; +import { ShortUrlVisitsHeader } from '../../src/visits/ShortUrlVisitsHeader'; import { ShortUrlDetail } from '../../src/short-urls/reducers/shortUrlDetail'; import { ShortUrlVisits } from '../../src/visits/reducers/shortUrlVisits'; import { Time } from '../../src/utils/Time'; diff --git a/test/visits/TagVisits.test.tsx b/test/visits/TagVisits.test.tsx index 965d1ad1..114b68c0 100644 --- a/test/visits/TagVisits.test.tsx +++ b/test/visits/TagVisits.test.tsx @@ -1,8 +1,8 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Mock } from 'ts-mockery'; -import createTagVisits, { TagVisitsProps } from '../../src/visits/TagVisits'; -import TagVisitsHeader from '../../src/visits/TagVisitsHeader'; -import ColorGenerator from '../../src/utils/services/ColorGenerator'; +import { TagVisits as createTagVisits, TagVisitsProps } from '../../src/visits/TagVisits'; +import { TagVisitsHeader } from '../../src/visits/TagVisitsHeader'; +import { ColorGenerator } from '../../src/utils/services/ColorGenerator'; import { TagVisits as TagVisitsStats } from '../../src/visits/reducers/tagVisits'; import { VisitsStats } from '../../src/visits/VisitsStats'; import { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub'; diff --git a/test/visits/TagVisitsHeader.test.tsx b/test/visits/TagVisitsHeader.test.tsx index 9abca3a7..a48984e9 100644 --- a/test/visits/TagVisitsHeader.test.tsx +++ b/test/visits/TagVisitsHeader.test.tsx @@ -1,9 +1,9 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Mock } from 'ts-mockery'; -import Tag from '../../src/tags/helpers/Tag'; -import TagVisitsHeader from '../../src/visits/TagVisitsHeader'; +import { Tag } from '../../src/tags/helpers/Tag'; +import { TagVisitsHeader } from '../../src/visits/TagVisitsHeader'; import { TagVisits } from '../../src/visits/reducers/tagVisits'; -import ColorGenerator from '../../src/utils/services/ColorGenerator'; +import { ColorGenerator } from '../../src/utils/services/ColorGenerator'; describe('', () => { let wrapper: ShallowWrapper; diff --git a/test/visits/VisitsHeader.test.tsx b/test/visits/VisitsHeader.test.tsx index 53d13630..f05cb6a0 100644 --- a/test/visits/VisitsHeader.test.tsx +++ b/test/visits/VisitsHeader.test.tsx @@ -1,6 +1,6 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Mock } from 'ts-mockery'; -import VisitsHeader from '../../src/visits/VisitsHeader'; +import { VisitsHeader } from '../../src/visits/VisitsHeader'; import { Visit } from '../../src/visits/types'; describe('', () => { diff --git a/test/visits/VisitsStats.test.tsx b/test/visits/VisitsStats.test.tsx index 2c6fbf1c..0c7d3de4 100644 --- a/test/visits/VisitsStats.test.tsx +++ b/test/visits/VisitsStats.test.tsx @@ -4,10 +4,10 @@ import { sum } from 'ramda'; import { Mock } from 'ts-mockery'; import { Route } from 'react-router-dom'; import { VisitsStats } from '../../src/visits/VisitsStats'; -import Message from '../../src/utils/Message'; +import { Message } from '../../src/utils/Message'; import { Visit, VisitsInfo } from '../../src/visits/types'; import { LineChartCard } from '../../src/visits/charts/LineChartCard'; -import VisitsTable from '../../src/visits/VisitsTable'; +import { VisitsTable } from '../../src/visits/VisitsTable'; import { Result } from '../../src/utils/Result'; import { Settings } from '../../src/settings/reducers/settings'; import { SelectedServer } from '../../src/servers/data'; diff --git a/test/visits/VisitsTable.test.tsx b/test/visits/VisitsTable.test.tsx index 279ada47..4f5fc10e 100644 --- a/test/visits/VisitsTable.test.tsx +++ b/test/visits/VisitsTable.test.tsx @@ -1,6 +1,6 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Mock } from 'ts-mockery'; -import VisitsTable, { VisitsTableProps } from '../../src/visits/VisitsTable'; +import { VisitsTable, VisitsTableProps } from '../../src/visits/VisitsTable'; import { rangeOf } from '../../src/utils/utils'; import { SimplePaginator } from '../../src/common/SimplePaginator'; import { SearchField } from '../../src/utils/SearchField'; diff --git a/test/visits/charts/SortableBarChartCard.test.tsx b/test/visits/charts/SortableBarChartCard.test.tsx index dcf6c855..a9ebe28a 100644 --- a/test/visits/charts/SortableBarChartCard.test.tsx +++ b/test/visits/charts/SortableBarChartCard.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { range } from 'ramda'; import { OrderingDropdown } from '../../../src/utils/OrderingDropdown'; -import PaginationDropdown from '../../../src/utils/PaginationDropdown'; +import { PaginationDropdown } from '../../../src/utils/PaginationDropdown'; import { rangeOf } from '../../../src/utils/utils'; import { OrderDir } from '../../../src/utils/helpers/ordering'; import { Stats } from '../../../src/visits/types'; diff --git a/test/visits/helpers/MapModal.test.tsx b/test/visits/helpers/MapModal.test.tsx index 08f5d86e..f582a582 100644 --- a/test/visits/helpers/MapModal.test.tsx +++ b/test/visits/helpers/MapModal.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Marker, Popup } from 'react-leaflet'; import { Modal } from 'reactstrap'; -import MapModal from '../../../src/visits/helpers/MapModal'; +import { MapModal } from '../../../src/visits/helpers/MapModal'; import { CityStats } from '../../../src/visits/types'; describe('', () => { diff --git a/test/visits/helpers/OpenMapModalBtn.test.tsx b/test/visits/helpers/OpenMapModalBtn.test.tsx index 12fd9443..89eea4fc 100644 --- a/test/visits/helpers/OpenMapModalBtn.test.tsx +++ b/test/visits/helpers/OpenMapModalBtn.test.tsx @@ -1,8 +1,8 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Dropdown, DropdownItem, UncontrolledTooltip } from 'reactstrap'; import { Mock } from 'ts-mockery'; -import OpenMapModalBtn from '../../../src/visits/helpers/OpenMapModalBtn'; -import MapModal from '../../../src/visits/helpers/MapModal'; +import { OpenMapModalBtn } from '../../../src/visits/helpers/OpenMapModalBtn'; +import { MapModal } from '../../../src/visits/helpers/MapModal'; import { CityStats } from '../../../src/visits/types'; describe('', () => {