From 2cac1d9fd2c496c4e681fbca67da7857f16e6a4a Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 28 May 2022 10:47:39 +0200 Subject: [PATCH] More default exports removals --- src/api/services/ShlinkApiClient.ts | 2 +- src/api/services/ShlinkApiClientBuilder.ts | 6 ++---- src/api/services/provideServices.ts | 2 +- src/common/AsideMenu.tsx | 4 +--- src/common/Home.tsx | 2 +- src/common/ShlinkVersions.tsx | 4 +--- src/common/ShlinkVersionsContainer.tsx | 6 ++---- src/common/services/provideServices.ts | 4 ++-- src/servers/CreateServer.tsx | 4 +--- src/servers/DeleteServerButton.tsx | 4 +--- src/servers/DeleteServerModal.tsx | 4 +--- src/servers/ServersListGroup.tsx | 4 +--- src/servers/helpers/ImportServersBtn.tsx | 4 +--- src/servers/helpers/ServerError.tsx | 2 +- src/servers/services/provideServices.ts | 8 ++++---- src/settings/RealTimeUpdatesSettings.tsx | 4 +--- src/settings/services/provideServices.ts | 2 +- test/api/services/ShlinkApiClient.test.ts | 2 +- test/api/services/ShlinkApiClientBuilder.test.ts | 2 +- test/common/AsideMenu.test.tsx | 4 ++-- test/common/ShlinkVersions.test.tsx | 2 +- test/common/ShlinkVersionsContainer.test.tsx | 2 +- test/domains/reducers/domainRedirects.test.ts | 2 +- test/domains/reducers/domainsList.test.ts | 2 +- test/mercure/reducers/mercureInfo.test.ts | 2 +- test/servers/CreateServer.test.tsx | 4 ++-- test/servers/DeleteServerButton.test.tsx | 4 ++-- test/servers/DeleteServerModal.test.tsx | 2 +- test/servers/ServersListGroup.test.tsx | 2 +- test/servers/helpers/ImportServersBtn.test.tsx | 7 +++++-- test/settings/RealTimeUpdatesSettings.test.tsx | 2 +- test/short-urls/reducers/shortUrlCreation.test.ts | 2 +- test/short-urls/reducers/shortUrlDeletion.test.ts | 2 +- test/short-urls/reducers/shortUrlDetail.test.ts | 2 +- test/short-urls/reducers/shortUrlsList.test.ts | 2 +- test/tags/reducers/tagDelete.test.ts | 2 +- test/tags/reducers/tagEdit.test.ts | 2 +- test/visits/reducers/domainVisits.test.ts | 2 +- test/visits/reducers/nonOrphanVisits.test.ts | 2 +- test/visits/reducers/orphanVisits.test.ts | 2 +- test/visits/reducers/shortUrlVisits.test.ts | 2 +- test/visits/reducers/tagVisits.test.ts | 2 +- test/visits/reducers/visitsOverview.test.ts | 2 +- 43 files changed, 56 insertions(+), 73 deletions(-) diff --git a/src/api/services/ShlinkApiClient.ts b/src/api/services/ShlinkApiClient.ts index 54682e06..3e4c1b51 100644 --- a/src/api/services/ShlinkApiClient.ts +++ b/src/api/services/ShlinkApiClient.ts @@ -29,7 +29,7 @@ const normalizeOrderByInParams = (params: ShlinkShortUrlsListParams): ShlinkShor return { ...rest, orderBy: orderToString(orderBy) }; }; -export default class ShlinkApiClient { +export class ShlinkApiClient { public constructor( private readonly axios: AxiosInstance, private readonly baseUrl: string, diff --git a/src/api/services/ShlinkApiClientBuilder.ts b/src/api/services/ShlinkApiClientBuilder.ts index d2ba24cd..0d7efc0f 100644 --- a/src/api/services/ShlinkApiClientBuilder.ts +++ b/src/api/services/ShlinkApiClientBuilder.ts @@ -2,7 +2,7 @@ import { AxiosInstance } from 'axios'; import { prop } from 'ramda'; import { hasServerData, SelectedServer, ServerWithId } from '../../servers/data'; import { GetState } from '../../container/types'; -import ShlinkApiClient from './ShlinkApiClient'; +import { ShlinkApiClient } from './ShlinkApiClient'; const apiClients: Record = {}; @@ -12,7 +12,7 @@ const getSelectedServerFromState = (getState: GetState): SelectedServer => prop( export type ShlinkApiClientBuilder = (getStateOrSelectedServer: GetState | ServerWithId) => ShlinkApiClient; -const buildShlinkApiClient = (axios: AxiosInstance): ShlinkApiClientBuilder => ( +export const buildShlinkApiClient = (axios: AxiosInstance): ShlinkApiClientBuilder => ( getStateOrSelectedServer: GetState | ServerWithId, ) => { const server = isGetState(getStateOrSelectedServer) @@ -32,5 +32,3 @@ const buildShlinkApiClient = (axios: AxiosInstance): ShlinkApiClientBuilder => ( return apiClients[clientKey]; }; - -export default buildShlinkApiClient; diff --git a/src/api/services/provideServices.ts b/src/api/services/provideServices.ts index 2d0abf4e..3ddb60e7 100644 --- a/src/api/services/provideServices.ts +++ b/src/api/services/provideServices.ts @@ -1,5 +1,5 @@ import Bottle from 'bottlejs'; -import buildShlinkApiClient from './ShlinkApiClientBuilder'; +import { buildShlinkApiClient } from './ShlinkApiClientBuilder'; const provideServices = (bottle: Bottle) => { bottle.serviceFactory('buildShlinkApiClient', buildShlinkApiClient, 'axios'); diff --git a/src/common/AsideMenu.tsx b/src/common/AsideMenu.tsx index 826ff3b6..f7c81965 100644 --- a/src/common/AsideMenu.tsx +++ b/src/common/AsideMenu.tsx @@ -34,7 +34,7 @@ const AsideMenuItem: FC = ({ children, to, className, ...res ); -const AsideMenu = (DeleteServerButton: FC) => ( +export const AsideMenu = (DeleteServerButton: FC) => ( { selectedServer, showOnMobile = false }: AsideMenuProps, ) => { const hasId = isServerWithId(selectedServer); @@ -89,5 +89,3 @@ const AsideMenu = (DeleteServerButton: FC) => ( ); }; - -export default AsideMenu; diff --git a/src/common/Home.tsx b/src/common/Home.tsx index cd8ab483..018f9ce3 100644 --- a/src/common/Home.tsx +++ b/src/common/Home.tsx @@ -5,7 +5,7 @@ import { Card, Row } from 'reactstrap'; import { ExternalLink } from 'react-external-link'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faExternalLinkAlt, faPlus } from '@fortawesome/free-solid-svg-icons'; -import ServersListGroup from '../servers/ServersListGroup'; +import { ServersListGroup } from '../servers/ServersListGroup'; import { ServersMap } from '../servers/data'; import { ShlinkLogo } from './img/ShlinkLogo'; import './Home.scss'; diff --git a/src/common/ShlinkVersions.tsx b/src/common/ShlinkVersions.tsx index 5210e50e..e750b25f 100644 --- a/src/common/ShlinkVersions.tsx +++ b/src/common/ShlinkVersions.tsx @@ -17,7 +17,7 @@ const VersionLink = ({ project, version }: { project: 'shlink' | 'shlink-web-cli ); -const ShlinkVersions = ({ selectedServer, clientVersion = SHLINK_WEB_CLIENT_VERSION }: ShlinkVersionsProps) => { +export const ShlinkVersions = ({ selectedServer, clientVersion = SHLINK_WEB_CLIENT_VERSION }: ShlinkVersionsProps) => { const normalizedClientVersion = normalizeVersion(clientVersion); return ( @@ -29,5 +29,3 @@ const ShlinkVersions = ({ selectedServer, clientVersion = SHLINK_WEB_CLIENT_VERS ); }; - -export default ShlinkVersions; diff --git a/src/common/ShlinkVersionsContainer.tsx b/src/common/ShlinkVersionsContainer.tsx index 378283e8..0cdf8405 100644 --- a/src/common/ShlinkVersionsContainer.tsx +++ b/src/common/ShlinkVersionsContainer.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames'; import { SelectedServer } from '../servers/data'; -import ShlinkVersions from './ShlinkVersions'; +import { ShlinkVersions } from './ShlinkVersions'; import { Sidebar } from './reducers/sidebar'; import './ShlinkVersionsContainer.scss'; @@ -9,7 +9,7 @@ export interface ShlinkVersionsContainerProps { sidebar: Sidebar; } -const ShlinkVersionsContainer = ({ selectedServer, sidebar }: ShlinkVersionsContainerProps) => { +export const ShlinkVersionsContainer = ({ selectedServer, sidebar }: ShlinkVersionsContainerProps) => { const classes = classNames('text-center', { 'shlink-versions-container--with-sidebar': sidebar.sidebarPresent, }); @@ -20,5 +20,3 @@ const ShlinkVersionsContainer = ({ selectedServer, sidebar }: ShlinkVersionsCont ); }; - -export default ShlinkVersionsContainer; diff --git a/src/common/services/provideServices.ts b/src/common/services/provideServices.ts index 604ab336..3a613bd2 100644 --- a/src/common/services/provideServices.ts +++ b/src/common/services/provideServices.ts @@ -4,9 +4,9 @@ import { ScrollToTop } from '../ScrollToTop'; import { MainHeader } from '../MainHeader'; import { Home } from '../Home'; import { MenuLayout } from '../MenuLayout'; -import AsideMenu from '../AsideMenu'; +import { AsideMenu } from '../AsideMenu'; import { ErrorHandler } from '../ErrorHandler'; -import ShlinkVersionsContainer from '../ShlinkVersionsContainer'; +import { ShlinkVersionsContainer } from '../ShlinkVersionsContainer'; import { ConnectDecorator } from '../../container/types'; import { withoutSelectedServer } from '../../servers/helpers/withoutSelectedServer'; import { sidebarNotPresent, sidebarPresent } from '../reducers/sidebar'; diff --git a/src/servers/CreateServer.tsx b/src/servers/CreateServer.tsx index 6bdf75d7..bcc60e46 100644 --- a/src/servers/CreateServer.tsx +++ b/src/servers/CreateServer.tsx @@ -26,7 +26,7 @@ const ImportResult = ({ type }: { type: 'error' | 'success' }) => ( ); -const CreateServer = (ImportServersBtn: FC, useStateFlagTimeout: StateFlagTimeout) => ( +export const CreateServer = (ImportServersBtn: FC, useStateFlagTimeout: StateFlagTimeout) => ( { servers, createServer }: CreateServerProps, ) => { const navigate = useNavigate(); @@ -77,5 +77,3 @@ const CreateServer = (ImportServersBtn: FC, useStateFlagT ); }; - -export default CreateServer; diff --git a/src/servers/DeleteServerButton.tsx b/src/servers/DeleteServerButton.tsx index a40e6ecc..4759938c 100644 --- a/src/servers/DeleteServerButton.tsx +++ b/src/servers/DeleteServerButton.tsx @@ -11,7 +11,7 @@ export type DeleteServerButtonProps = PropsWithChildren<{ textClassName?: string; }>; -const DeleteServerButton = (DeleteServerModal: FC): FC => ( +export const DeleteServerButton = (DeleteServerModal: FC): FC => ( { server, className, children, textClassName }, ) => { const [isModalOpen, , showModal, hideModal] = useToggle(); @@ -27,5 +27,3 @@ const DeleteServerButton = (DeleteServerModal: FC): FC ); }; - -export default DeleteServerButton; diff --git a/src/servers/DeleteServerModal.tsx b/src/servers/DeleteServerModal.tsx index 9679dd7c..911ba3d0 100644 --- a/src/servers/DeleteServerModal.tsx +++ b/src/servers/DeleteServerModal.tsx @@ -14,7 +14,7 @@ interface DeleteServerModalConnectProps extends DeleteServerModalProps { deleteServer: (server: ServerWithId) => void; } -const DeleteServerModal: FC = ( +export const DeleteServerModal: FC = ( { server, toggle, isOpen, deleteServer, redirectHome = true }, ) => { const navigate = useNavigate(); @@ -43,5 +43,3 @@ const DeleteServerModal: FC = ( ); }; - -export default DeleteServerModal; diff --git a/src/servers/ServersListGroup.tsx b/src/servers/ServersListGroup.tsx index a88787a7..36bac3bf 100644 --- a/src/servers/ServersListGroup.tsx +++ b/src/servers/ServersListGroup.tsx @@ -19,7 +19,7 @@ const ServerListItem = ({ id, name }: { id: string; name: string }) => ( ); -const ServersListGroup: FC = ({ servers, children, embedded = false }) => ( +export const ServersListGroup: FC = ({ servers, children, embedded = false }) => ( <> {children &&
{children}
} {servers.length > 0 && ( @@ -31,5 +31,3 @@ const ServersListGroup: FC = ({ servers, children, embedd )} ); - -export default ServersListGroup; diff --git a/src/servers/helpers/ImportServersBtn.tsx b/src/servers/helpers/ImportServersBtn.tsx index e01500c6..a5673623 100644 --- a/src/servers/helpers/ImportServersBtn.tsx +++ b/src/servers/helpers/ImportServersBtn.tsx @@ -27,7 +27,7 @@ interface ImportServersBtnConnectProps extends ImportServersBtnProps { const serversFiltering = (servers: ServerData[]) => ({ url, apiKey }: ServerData) => servers.some((server) => server.url === url && server.apiKey === apiKey); -const ImportServersBtn = ({ importServersFromFile }: ServersImporter): FC => ({ +export const ImportServersBtn = ({ importServersFromFile }: ServersImporter): FC => ({ createServers, servers, fileRef, @@ -89,5 +89,3 @@ const ImportServersBtn = ({ importServersFromFile }: ServersImporter): FC ); }; - -export default ImportServersBtn; diff --git a/src/servers/helpers/ServerError.tsx b/src/servers/helpers/ServerError.tsx index c84a5708..2906b64d 100644 --- a/src/servers/helpers/ServerError.tsx +++ b/src/servers/helpers/ServerError.tsx @@ -1,7 +1,7 @@ import { FC } from 'react'; import { Link } from 'react-router-dom'; import Message from '../../utils/Message'; -import ServersListGroup from '../ServersListGroup'; +import { ServersListGroup } from '../ServersListGroup'; import { DeleteServerButtonProps } from '../DeleteServerButton'; import { isServerWithId, SelectedServer, ServersMap } from '../data'; import { NoMenuLayout } from '../../common/NoMenuLayout'; diff --git a/src/servers/services/provideServices.ts b/src/servers/services/provideServices.ts index 9f177cb6..1d6b0489 100644 --- a/src/servers/services/provideServices.ts +++ b/src/servers/services/provideServices.ts @@ -1,10 +1,10 @@ import Bottle from 'bottlejs'; -import CreateServer from '../CreateServer'; +import { CreateServer } from '../CreateServer'; import { ServersDropdown } from '../ServersDropdown'; -import DeleteServerModal from '../DeleteServerModal'; -import DeleteServerButton from '../DeleteServerButton'; +import { DeleteServerModal } from '../DeleteServerModal'; +import { DeleteServerButton } from '../DeleteServerButton'; import { EditServer } from '../EditServer'; -import ImportServersBtn from '../helpers/ImportServersBtn'; +import { ImportServersBtn } from '../helpers/ImportServersBtn'; import { resetSelectedServer, selectServer } from '../reducers/selectedServer'; import { createServer, createServers, deleteServer, editServer, setAutoConnect } from '../reducers/servers'; import { fetchServers } from '../reducers/remoteServers'; diff --git a/src/settings/RealTimeUpdatesSettings.tsx b/src/settings/RealTimeUpdatesSettings.tsx index f9cccbce..a4218b5a 100644 --- a/src/settings/RealTimeUpdatesSettings.tsx +++ b/src/settings/RealTimeUpdatesSettings.tsx @@ -14,7 +14,7 @@ interface RealTimeUpdatesProps { const intervalValue = (interval?: number) => (!interval ? '' : `${interval}`); -const RealTimeUpdatesSettings = ( +export const RealTimeUpdatesSettings = ( { settings: { realTimeUpdates }, toggleRealTimeUpdates, setRealTimeUpdatesInterval }: RealTimeUpdatesProps, ) => ( @@ -52,5 +52,3 @@ const RealTimeUpdatesSettings = ( ); - -export default RealTimeUpdatesSettings; diff --git a/src/settings/services/provideServices.ts b/src/settings/services/provideServices.ts index 344ad8a8..57870e91 100644 --- a/src/settings/services/provideServices.ts +++ b/src/settings/services/provideServices.ts @@ -1,5 +1,5 @@ import Bottle from 'bottlejs'; -import RealTimeUpdatesSettings from '../RealTimeUpdatesSettings'; +import { RealTimeUpdatesSettings } from '../RealTimeUpdatesSettings'; import Settings from '../Settings'; import { setRealTimeUpdatesInterval, diff --git a/test/api/services/ShlinkApiClient.test.ts b/test/api/services/ShlinkApiClient.test.ts index 91153fb4..f5f7b647 100644 --- a/test/api/services/ShlinkApiClient.test.ts +++ b/test/api/services/ShlinkApiClient.test.ts @@ -1,6 +1,6 @@ import { AxiosInstance, AxiosRequestConfig } from 'axios'; import { Mock } from 'ts-mockery'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { OptionalString } from '../../../src/utils/utils'; import { ShlinkDomain, ShlinkVisitsOverview } from '../../../src/api/types'; import { ShortUrl, ShortUrlsOrder } from '../../../src/short-urls/data'; diff --git a/test/api/services/ShlinkApiClientBuilder.test.ts b/test/api/services/ShlinkApiClientBuilder.test.ts index 6967b0f4..b67bd7e6 100644 --- a/test/api/services/ShlinkApiClientBuilder.test.ts +++ b/test/api/services/ShlinkApiClientBuilder.test.ts @@ -1,6 +1,6 @@ import { Mock } from 'ts-mockery'; import { AxiosInstance } from 'axios'; -import buildShlinkApiClient from '../../../src/api/services/ShlinkApiClientBuilder'; +import { buildShlinkApiClient } from '../../../src/api/services/ShlinkApiClientBuilder'; import { ReachableServer, SelectedServer } from '../../../src/servers/data'; import { ShlinkState } from '../../../src/container/types'; diff --git a/test/common/AsideMenu.test.tsx b/test/common/AsideMenu.test.tsx index 6ebc0a31..df49244e 100644 --- a/test/common/AsideMenu.test.tsx +++ b/test/common/AsideMenu.test.tsx @@ -1,12 +1,12 @@ import { render, screen } from '@testing-library/react'; import { Mock } from 'ts-mockery'; import { MemoryRouter } from 'react-router-dom'; -import asideMenuCreator from '../../src/common/AsideMenu'; +import { AsideMenu as createAsideMenu } from '../../src/common/AsideMenu'; import { ReachableServer } from '../../src/servers/data'; import { SemVer } from '../../src/utils/helpers/version'; describe('', () => { - const AsideMenu = asideMenuCreator(() => <>DeleteServerButton); + const AsideMenu = createAsideMenu(() => <>DeleteServerButton); const setUp = (version: SemVer, id: string | false = 'abc123') => render( ({ id: id || undefined, version })} /> diff --git a/test/common/ShlinkVersions.test.tsx b/test/common/ShlinkVersions.test.tsx index 04273b32..7c6127f1 100644 --- a/test/common/ShlinkVersions.test.tsx +++ b/test/common/ShlinkVersions.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/react'; import { Mock } from 'ts-mockery'; -import ShlinkVersions, { ShlinkVersionsProps } from '../../src/common/ShlinkVersions'; +import { ShlinkVersions, ShlinkVersionsProps } from '../../src/common/ShlinkVersions'; import { NonReachableServer, NotFoundServer, ReachableServer } from '../../src/servers/data'; describe('', () => { diff --git a/test/common/ShlinkVersionsContainer.test.tsx b/test/common/ShlinkVersionsContainer.test.tsx index d264051d..1920fdc2 100644 --- a/test/common/ShlinkVersionsContainer.test.tsx +++ b/test/common/ShlinkVersionsContainer.test.tsx @@ -1,6 +1,6 @@ import { render } from '@testing-library/react'; import { Mock } from 'ts-mockery'; -import ShlinkVersionsContainer from '../../src/common/ShlinkVersionsContainer'; +import { ShlinkVersionsContainer } from '../../src/common/ShlinkVersionsContainer'; import { SelectedServer } from '../../src/servers/data'; import { Sidebar } from '../../src/common/reducers/sidebar'; diff --git a/test/domains/reducers/domainRedirects.test.ts b/test/domains/reducers/domainRedirects.test.ts index 3cb56393..f77f8377 100644 --- a/test/domains/reducers/domainRedirects.test.ts +++ b/test/domains/reducers/domainRedirects.test.ts @@ -1,5 +1,5 @@ import { Mock } from 'ts-mockery'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { EDIT_DOMAIN_REDIRECTS, EDIT_DOMAIN_REDIRECTS_ERROR, diff --git a/test/domains/reducers/domainsList.test.ts b/test/domains/reducers/domainsList.test.ts index 5c1730f5..d40a58b8 100644 --- a/test/domains/reducers/domainsList.test.ts +++ b/test/domains/reducers/domainsList.test.ts @@ -15,7 +15,7 @@ import reducer, { } from '../../../src/domains/reducers/domainsList'; import { EDIT_DOMAIN_REDIRECTS } from '../../../src/domains/reducers/domainRedirects'; import { ShlinkDomainRedirects } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { Domain } from '../../../src/domains/data'; import { ShlinkState } from '../../../src/container/types'; import { SelectedServer, ServerData } from '../../../src/servers/data'; diff --git a/test/mercure/reducers/mercureInfo.test.ts b/test/mercure/reducers/mercureInfo.test.ts index 239a9ba1..d5cb2972 100644 --- a/test/mercure/reducers/mercureInfo.test.ts +++ b/test/mercure/reducers/mercureInfo.test.ts @@ -7,7 +7,7 @@ import reducer, { GetMercureInfoAction, } from '../../../src/mercure/reducers/mercureInfo'; import { ShlinkMercureInfo } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { GetState } from '../../../src/container/types'; describe('mercureInfoReducer', () => { diff --git a/test/servers/CreateServer.test.tsx b/test/servers/CreateServer.test.tsx index ba9abb4a..d23a6d1e 100644 --- a/test/servers/CreateServer.test.tsx +++ b/test/servers/CreateServer.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Mock } from 'ts-mockery'; import { useNavigate } from 'react-router-dom'; -import createServerConstruct from '../../src/servers/CreateServer'; +import { CreateServer as createCreateServer } from '../../src/servers/CreateServer'; import { ServerForm } from '../../src/servers/helpers/ServerForm'; import { ServerWithId } from '../../src/servers/data'; import { DuplicatedServersModal } from '../../src/servers/helpers/DuplicatedServersModal'; @@ -21,7 +21,7 @@ describe('', () => { .mockReturnValueOnce([serversImported, () => '']) .mockReturnValueOnce([importFailed, () => '']) .mockReturnValue([]); - const CreateServer = createServerConstruct(ImportServersBtn, useStateFlagTimeout); + const CreateServer = createCreateServer(ImportServersBtn, useStateFlagTimeout); wrapper = shallow(); diff --git a/test/servers/DeleteServerButton.test.tsx b/test/servers/DeleteServerButton.test.tsx index f66e8a95..40f1c9d8 100644 --- a/test/servers/DeleteServerButton.test.tsx +++ b/test/servers/DeleteServerButton.test.tsx @@ -2,11 +2,11 @@ import { ReactNode } from 'react'; import userEvent from '@testing-library/user-event'; import { render, screen, waitFor } from '@testing-library/react'; import { Mock } from 'ts-mockery'; -import deleteServerButtonConstruct from '../../src/servers/DeleteServerButton'; +import { DeleteServerButton as createDeleteServerButton } from '../../src/servers/DeleteServerButton'; import { ServerWithId } from '../../src/servers/data'; describe('', () => { - const DeleteServerButton = deleteServerButtonConstruct( + const DeleteServerButton = createDeleteServerButton( ({ isOpen }) => <>DeleteServerModal {isOpen ? '[Open]' : '[Closed]'}, ); const setUp = (children?: ReactNode) => ({ diff --git a/test/servers/DeleteServerModal.test.tsx b/test/servers/DeleteServerModal.test.tsx index 83c917c7..39b3832e 100644 --- a/test/servers/DeleteServerModal.test.tsx +++ b/test/servers/DeleteServerModal.test.tsx @@ -2,7 +2,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap'; import { Mock } from 'ts-mockery'; import { useNavigate } from 'react-router-dom'; -import DeleteServerModal from '../../src/servers/DeleteServerModal'; +import { DeleteServerModal } from '../../src/servers/DeleteServerModal'; import { ServerWithId } from '../../src/servers/data'; jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), useNavigate: jest.fn() })); diff --git a/test/servers/ServersListGroup.test.tsx b/test/servers/ServersListGroup.test.tsx index 35830681..2f1b8e81 100644 --- a/test/servers/ServersListGroup.test.tsx +++ b/test/servers/ServersListGroup.test.tsx @@ -1,7 +1,7 @@ import { shallow, ShallowWrapper } from 'enzyme'; import { ListGroup } from 'reactstrap'; import { Mock } from 'ts-mockery'; -import ServersListGroup from '../../src/servers/ServersListGroup'; +import { ServersListGroup } from '../../src/servers/ServersListGroup'; import { ServerWithId } from '../../src/servers/data'; describe('', () => { diff --git a/test/servers/helpers/ImportServersBtn.test.tsx b/test/servers/helpers/ImportServersBtn.test.tsx index 636ff295..88e1e345 100644 --- a/test/servers/helpers/ImportServersBtn.test.tsx +++ b/test/servers/helpers/ImportServersBtn.test.tsx @@ -2,7 +2,10 @@ import { ReactNode } from 'react'; import { shallow, ShallowWrapper } from 'enzyme'; import { UncontrolledTooltip } from 'reactstrap'; import { Mock } from 'ts-mockery'; -import importServersBtnConstruct, { ImportServersBtnProps } from '../../../src/servers/helpers/ImportServersBtn'; +import { + ImportServersBtn as createImportServersBtn, + ImportServersBtnProps, +} from '../../../src/servers/helpers/ImportServersBtn'; import { ServersImporter } from '../../../src/servers/services/ServersImporter'; import { DuplicatedServersModal } from '../../../src/servers/helpers/DuplicatedServersModal'; @@ -14,7 +17,7 @@ describe('', () => { const serversImporterMock = Mock.of({ importServersFromFile }); const click = jest.fn(); const fileRef = { current: Mock.of({ click }) }; - const ImportServersBtn = importServersBtnConstruct(serversImporterMock); + const ImportServersBtn = createImportServersBtn(serversImporterMock); const createWrapper = (props: Partial = {}) => { wrapper = shallow( { diff --git a/test/short-urls/reducers/shortUrlDeletion.test.ts b/test/short-urls/reducers/shortUrlDeletion.test.ts index 588dc790..0eb61b25 100644 --- a/test/short-urls/reducers/shortUrlDeletion.test.ts +++ b/test/short-urls/reducers/shortUrlDeletion.test.ts @@ -8,7 +8,7 @@ import reducer, { deleteShortUrl, } from '../../../src/short-urls/reducers/shortUrlDeletion'; import { ProblemDetailsError } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; describe('shortUrlDeletionReducer', () => { describe('reducer', () => { diff --git a/test/short-urls/reducers/shortUrlDetail.test.ts b/test/short-urls/reducers/shortUrlDetail.test.ts index d83d035a..2a6b9df7 100644 --- a/test/short-urls/reducers/shortUrlDetail.test.ts +++ b/test/short-urls/reducers/shortUrlDetail.test.ts @@ -7,7 +7,7 @@ import reducer, { ShortUrlDetailAction, } from '../../../src/short-urls/reducers/shortUrlDetail'; import { ShortUrl } from '../../../src/short-urls/data'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; import { ShortUrlsList } from '../../../src/short-urls/reducers/shortUrlsList'; diff --git a/test/short-urls/reducers/shortUrlsList.test.ts b/test/short-urls/reducers/shortUrlsList.test.ts index 4aac6f92..fbff5de0 100644 --- a/test/short-urls/reducers/shortUrlsList.test.ts +++ b/test/short-urls/reducers/shortUrlsList.test.ts @@ -8,7 +8,7 @@ import reducer, { import { SHORT_URL_DELETED } from '../../../src/short-urls/reducers/shortUrlDeletion'; import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { ShortUrl } from '../../../src/short-urls/data'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkPaginator, ShlinkShortUrlsResponse } from '../../../src/api/types'; import { CREATE_SHORT_URL } from '../../../src/short-urls/reducers/shortUrlCreation'; import { SHORT_URL_EDITED } from '../../../src/short-urls/reducers/shortUrlEdition'; diff --git a/test/tags/reducers/tagDelete.test.ts b/test/tags/reducers/tagDelete.test.ts index c68578a2..a4726bf1 100644 --- a/test/tags/reducers/tagDelete.test.ts +++ b/test/tags/reducers/tagDelete.test.ts @@ -7,7 +7,7 @@ import reducer, { tagDeleted, deleteTag, } from '../../../src/tags/reducers/tagDelete'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; describe('tagDeleteReducer', () => { diff --git a/test/tags/reducers/tagEdit.test.ts b/test/tags/reducers/tagEdit.test.ts index 08fbc1b9..63c6b719 100644 --- a/test/tags/reducers/tagEdit.test.ts +++ b/test/tags/reducers/tagEdit.test.ts @@ -8,7 +8,7 @@ import reducer, { editTag, EditTagAction, } from '../../../src/tags/reducers/tagEdit'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import ColorGenerator from '../../../src/utils/services/ColorGenerator'; import { ShlinkState } from '../../../src/container/types'; diff --git a/test/visits/reducers/domainVisits.test.ts b/test/visits/reducers/domainVisits.test.ts index 94499dfb..8c9bfccd 100644 --- a/test/visits/reducers/domainVisits.test.ts +++ b/test/visits/reducers/domainVisits.test.ts @@ -17,7 +17,7 @@ import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit } from '../../../src/visits/types'; import { ShlinkVisits } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; import { formatIsoDate } from '../../../src/utils/helpers/date'; import { DateInterval } from '../../../src/utils/dates/types'; diff --git a/test/visits/reducers/nonOrphanVisits.test.ts b/test/visits/reducers/nonOrphanVisits.test.ts index 99d0075f..7e6c2911 100644 --- a/test/visits/reducers/nonOrphanVisits.test.ts +++ b/test/visits/reducers/nonOrphanVisits.test.ts @@ -15,7 +15,7 @@ import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit, VisitsInfo } from '../../../src/visits/types'; import { ShlinkVisits } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; import { formatIsoDate } from '../../../src/utils/helpers/date'; import { DateInterval } from '../../../src/utils/dates/types'; diff --git a/test/visits/reducers/orphanVisits.test.ts b/test/visits/reducers/orphanVisits.test.ts index 0b26ee92..d57eff5c 100644 --- a/test/visits/reducers/orphanVisits.test.ts +++ b/test/visits/reducers/orphanVisits.test.ts @@ -15,7 +15,7 @@ import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit, VisitsInfo } from '../../../src/visits/types'; import { ShlinkVisits } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; import { formatIsoDate } from '../../../src/utils/helpers/date'; import { DateInterval } from '../../../src/utils/dates/types'; diff --git a/test/visits/reducers/shortUrlVisits.test.ts b/test/visits/reducers/shortUrlVisits.test.ts index e0a63ec1..3b7cdbb8 100644 --- a/test/visits/reducers/shortUrlVisits.test.ts +++ b/test/visits/reducers/shortUrlVisits.test.ts @@ -16,7 +16,7 @@ import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit } from '../../../src/visits/types'; import { ShlinkVisits } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; import { formatIsoDate } from '../../../src/utils/helpers/date'; import { DateInterval } from '../../../src/utils/dates/types'; diff --git a/test/visits/reducers/tagVisits.test.ts b/test/visits/reducers/tagVisits.test.ts index 34315bd0..5a217d24 100644 --- a/test/visits/reducers/tagVisits.test.ts +++ b/test/visits/reducers/tagVisits.test.ts @@ -16,7 +16,7 @@ import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit } from '../../../src/visits/types'; import { ShlinkVisits } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; import { formatIsoDate } from '../../../src/utils/helpers/date'; import { DateInterval } from '../../../src/utils/dates/types'; diff --git a/test/visits/reducers/visitsOverview.test.ts b/test/visits/reducers/visitsOverview.test.ts index fe0849da..98ced535 100644 --- a/test/visits/reducers/visitsOverview.test.ts +++ b/test/visits/reducers/visitsOverview.test.ts @@ -8,7 +8,7 @@ import reducer, { loadVisitsOverview, } from '../../../src/visits/reducers/visitsOverview'; import { CREATE_VISITS, CreateVisitsAction } from '../../../src/visits/reducers/visitCreation'; -import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; +import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import { ShlinkVisitsOverview } from '../../../src/api/types'; import { ShlinkState } from '../../../src/container/types'; import { CreateVisit, OrphanVisit, Visit } from '../../../src/visits/types';